Isaac Connor 14cde582cf Merge branch 'multi-server' into multiserverplusstorage ... Conflicts: src/zm_monitor.h		2015-12-14 16:55:26 -05:00
..
debian	Merge master	2015-12-14 15:49:32 -05:00
debian8	append /www to docroot for all debian/ubuntu dists	2015-10-23 16:08:32 -04:00
debian_cmake	merge master, bump version	2015-10-23 16:14:49 -04:00
fedora	rpm packaging updates	2015-11-21 15:23:13 -06:00
opensuse	Fix redalert.wav symlinks	2015-08-10 08:13:37 -05:00
redhat	update rpm documentation	2015-11-21 15:18:43 -06:00
ubuntu1204	Merge master	2015-12-14 15:49:32 -05:00
ubuntu1204_cmake	change format to native	2015-11-16 09:30:09 -05:00
ubuntu1504	split up depends into multiple lines	2015-10-30 12:19:43 -04:00
ubuntu1504_cmake	remove requirment for mysql. Mysql could be on another machine	2015-12-09 12:34:16 -05:00
ubuntu1504_cmake_split_packages	split up depends into multiple lines	2015-10-30 12:19:35 -04:00