]> 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: 5de72f2 bb4343c)
Merge remote-tracking branch 'origin/terencehill/m_toggle_fix'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 12 Dec 2011 08:33:57 +0000 (09:33 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 12 Dec 2011 08:33:57 +0000 (09:33 +0100)

Trivial merge