]> de.git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed1e2eb 6b70522)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/netradiant
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 17 Oct 2011 04:47:47 +0000 (06:47 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 17 Oct 2011 04:47:47 +0000 (06:47 +0200)
1  2 
tools/quake3/q3map2/q3map2.h patch | diff1 | diff2 | blob | history

diff --cc tools/quake3/q3map2/q3map2.h
Simple merge