zoneminder/distros
Emmanuel Papin b294569147 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
Merging conflicts fixed in files:
	CMakeLists.txt
	configure.ac
	distros/debian_cmake/control
	src/zm_monitor.h
	web/lang/de_de.php
	web/skins/classic/views/monitor.php
2015-07-20 16:49:04 +02:00
..
debian Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support 2015-07-20 16:49:04 +02:00
debian8 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support 2015-07-20 16:49:04 +02:00
debian8_cmake Add missing lines in distros/debian8_cmake/rules 2015-06-04 21:39:56 +02:00
debian_cmake Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support 2015-07-20 16:49:04 +02:00
fedora rpm packaging - require php-gd 2015-07-16 12:15:24 -05:00
opensuse Merge pull request #502 from knnniggett/systemd-2 2014-09-03 15:59:42 -04:00
redhat rpm packaging - require php-gd 2015-07-16 12:15:24 -05:00
ubuntu1204 php-gd should isntead be php5-gd 2015-07-16 13:59:06 -04:00
ubuntu1504 php-gd should isntead be php5-gd 2015-07-16 13:59:06 -04:00
ubuntu1504_cmake_split_packages php-gd should isntead be php5-gd 2015-07-16 13:59:06 -04:00