SteveGilvarry 4d7ded5ef0 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage ... Conflicts: configure.ac src/Makefile.am web/js/Makefile.am		2016-04-05 22:06:14 +10:00
..
debian	add libsys-cpu-perl and libsys-meminfo-perl	2016-03-08 15:55:29 -05:00
debian8	Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation	2016-04-04 20:44:53 -05:00
debian_cmake	There must be spaces before the comma	2016-03-08 16:06:16 -05: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	Merge branch 'master' into feature-h264-videostorage	2016-04-01 08:53:45 -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