]> de.git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e1aeb5 be4e243)
Merge branch 'master' of ssh://icculus.org/netradiant into icculus
authorRudolf Polzer <divverent@alientrap.org>
Mon, 10 May 2010 16:30:58 +0000 (18:30 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 10 May 2010 16:30:58 +0000 (18:30 +0200)
1  2 
tools/quake3/q3map2/q3map2.h patch | diff1 | diff2 | blob | history

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