]> de.git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 57d64f9 34dd934)
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 patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge