]> de.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: 62386e4 ff5ef3f)
Merge remote branch 'origin/terencehill/physics_panel_update'
authorRudolf Polzer <divVerent@xonotic.org>
Sun, 14 Aug 2011 09:24:03 +0000 (11:24 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sun, 14 Aug 2011 09:24:03 +0000 (11:24 +0200)

Trivial merge