]> de.git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 0138fcc 1e42a4f)
Merge branch 'icculus'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 24 Jun 2010 10:30:02 +0000 (12:30 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 24 Jun 2010 10:30:02 +0000 (12:30 +0200)

Trivial merge