]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1eadc66 b5a9e82)
Merge remote-tracking branch 'origin/fruitiex/uzidebugprint'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 1 Mar 2011 18:01:55 +0000 (19:01 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 1 Mar 2011 18:01:55 +0000 (19:01 +0100)

Trivial merge