]> 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: 2414c63 42e7e43)
Merge remote branch 'origin/tzork/moveturrets-fix'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 29 Nov 2010 09:38:44 +0000 (10:38 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 29 Nov 2010 09:38:44 +0000 (10:38 +0100)

Trivial merge