Merge branch 'asciiwolf/xonotic-makefile-fix'
[xonotic/xonotic.git] / GPL-3
2011-06-20 Rudolf PolzerMerge remote branch 'origin/TickleMeElmo/UpdateServerMaps'
2011-06-13 Rudolf Polzeradd license files... forgot to do that all the time...