Merge branch 'master' of git://de.git.xonotic.org/xonotic/netradiant
authorRudolf Polzer <divverent@alientrap.org>
Fri, 13 Jan 2012 23:32:48 +0000 (00:32 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 13 Jan 2012 23:32:48 +0000 (00:32 +0100)
1  2 
Makefile

diff --cc Makefile
Simple merge