Heng Liu 4e263f5913 Merge branch 'master' into feature-h264-videostorage ... Conflicts: src/zm_ffmpeg.h		2015-11-04 14:39:52 -08:00
..
debian	append /www to docroot for all debian/ubuntu dists	2015-10-23 16:08:32 -04:00
debian8	append /www to docroot for all debian/ubuntu dists	2015-10-23 16:08:32 -04:00
debian_cmake	append /www to docroot for all debian/ubuntu dists	2015-10-23 16:08:32 -04:00
fedora	move zm.conf under /etc/zm for Fedora	2015-10-03 13:38:51 -05:00
opensuse	Fix redalert.wav symlinks	2015-08-10 08:13:37 -05:00
redhat	minor centos 7 specfile change	2015-10-03 17:07:22 -05:00
ubuntu1204	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2015-10-28 08:12:46 +11:00
ubuntu1204_cmake	Setting the TZ ENV variable prevents every gettimeofday call from reading /etc/timezone	2015-10-01 11:46:51 -04:00
ubuntu1504	split up depends into multiple lines	2015-10-30 12:19:43 -04:00
ubuntu1504_cmake	change format to native, which makes building packages so much easier	2015-10-30 12:19:12 -04:00
ubuntu1504_cmake_split_packages	split up depends into multiple lines	2015-10-30 12:19:35 -04:00