Isaac Connor 13689d7a7d Merge branch 'storageareas' into newpointone ... Conflicts: web/lang/en_gb.php web/skins/classic/views/filter.php		2015-12-28 13:13:49 -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 branch 'master' into multi-server	2015-12-21 12:57:45 -05: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	Add a valid config if a person is using mod_fcgid instead of mod_php	2015-12-20 12:21:18 -05:00
ubuntu1204_cmake	change format to native	2015-11-16 09:30:09 -05:00
ubuntu1410	changelog update	2015-12-28 13:10:27 -05:00
ubuntu1504	split up depends into multiple lines	2015-10-30 12:19:43 -04:00
ubuntu1504_cmake	Merge branch 'multi-server' into storageareas	2015-12-23 13:13:25 -05:00
ubuntu1504_cmake_split_packages	split up depends into multiple lines	2015-10-30 12:19:35 -04:00