]> de.git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: f021552 e703106)
Merge remote branch 'origin/merlijn/osx-compile'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 1 Sep 2010 19:29:48 +0000 (21:29 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 1 Sep 2010 19:29:48 +0000 (21:29 +0200)

Trivial merge