]> de.git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 93f9dc3 778af4d)
Merge remote branch 'icculus/master'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 4 Jun 2010 18:58:08 +0000 (20:58 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 4 Jun 2010 18:58:08 +0000 (20:58 +0200)

Trivial merge