]> 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: 23f193f c01107b)
Merge remote branch 'refs/remotes/origin/fruitiex/sevchatbubble'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 16 Jul 2010 21:34:38 +0000 (23:34 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 16 Jul 2010 21:34:38 +0000 (23:34 +0200)

Trivial merge