ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
zoneminder/distros
History
SteveGilvarry 20c295ad0c Merge remote-tracking branch 'upstream/master' into feature-plugins 
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
 		2016-04-07 00:00:38 +10:00
..
debian Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
debian8 Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
debian_cmake Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
fedora Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation 2016-04-04 20:44:53 -05:00
opensuse codespell: misc. spelling corrections 2016-02-08 20:41:36 +11:00
redhat Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation 2016-04-04 20:44:53 -05:00
ubuntu1204 fix spacing in control file 2016-03-30 10:56:10 -04:00
ubuntu1204_cmake add libsys-cpu-perl and libsys-meminfo-perl 2016-03-08 15:55:56 -05:00
ubuntu1504 need spaces at beginning of lien 2016-03-09 11:18:27 -05:00
ubuntu1504_cmake remove extra comma 2016-03-09 11:17:50 -05:00
ubuntu1504_cmake_split_packages Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation 2016-04-04 20:44:53 -05:00