]> de.git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 077b74c cda0d10)
Merge branch 'master' into icculus
authorRudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 20:06:32 +0000 (22:06 +0200)
committerRudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 20:06:32 +0000 (22:06 +0200)

Trivial merge