20c295ad0c
Conflicts: .travis.yml CMakeLists.txt Makefile.am bootstrap.sh configure.ac distros/debian8/control distros/debian_cmake/control misc/Makefile.am scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in src/CMakeLists.txt src/Makefile.am src/zm_monitor.cpp src/zm_monitor.h src/zmstreamer.cpp web/lang/ru_ru.php web/skins/classic/css/classic/views/Makefile.am web/skins/classic/css/flat/views/Makefile.am web/skins/classic/views/Makefile.am web/skins/classic/views/js/Makefile.am |
||
---|---|---|
.. | ||
views | ||
control.css | ||
export.css | ||
skin.css |