ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
zoneminder/scripts
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
..
ZoneMinder Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
CMakeLists.txt zmtelemetry - the typo of my typo is my friend 2016-02-06 14:50:02 -06:00
zm.in zm.in: tabs-to-spaces 2015-04-16 14:26:31 +10:00
zmaudit.pl.in Fix issue where programs are installed in unexpected paths. 2016-03-11 14:28:16 -07:00
zmcamtool.pl.in codespell: misc. spelling corrections 2016-02-08 20:41:36 +11:00
zmcontrol.pl.in Fix issue where programs are installed in unexpected paths. 2016-03-11 14:28:16 -07:00
zmdbbackup.in remake this branch off master instead of off mysql2PDO. 2013-11-01 09:47:28 -04:00
zmdbrestore.in Migrate svn to git 2013-03-17 00:45:21 +01:00
zmdc.pl.in Fix issue where programs are installed in unexpected paths. 2016-03-11 14:28:16 -07:00
zmeventdump.in remake this branch off master instead of off mysql2PDO. 2013-11-01 09:47:28 -04:00
zmfilter.pl.in Merge pull request #1323 from knnniggett/zmfilter 2016-03-21 10:47:50 -04:00
zmlogrotate.conf.in Migrate svn to git 2013-03-17 00:45:21 +01:00
zmpkg.pl.in Fix issue where programs are installed in unexpected paths. 2016-03-11 14:28:16 -07:00
zmsystemctl.pl.in Modify zmsystemctl pod documentation 2015-06-20 16:13:40 -05:00
zmtelemetry.pl.in fix typo 2016-03-23 09:49:38 -04:00
zmtrack.pl.in Fix issue where programs are installed in unexpected paths. 2016-03-11 14:28:16 -07:00
zmtrigger.pl.in Fix issue where programs are installed in unexpected paths. 2016-03-11 14:28:16 -07:00
zmupdate.pl.in Corrected typo in function info 2016-01-22 12:12:39 -06:00
zmvideo.pl.in Fix issue where programs are installed in unexpected paths. 2016-03-11 14:28:16 -07:00
zmwatch.pl.in Fix issue where programs are installed in unexpected paths. 2016-03-11 14:28:16 -07:00
zmx10.pl.in Fix issue where programs are installed in unexpected paths. 2016-03-11 14:28:16 -07:00