]> 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: 68b0ad2 41e8d26)
Merge remote branch 'refs/remotes/origin/mrbougo/breakable_fix'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 20 Aug 2010 17:27:12 +0000 (19:27 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 20 Aug 2010 17:27:12 +0000 (19:27 +0200)

Trivial merge