]> de.git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d15b126 5dcc896)
Merge remote branch 'refs/remotes/origin/fruitiex/sevchatbubble'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 16 Jul 2010 22:00:57 +0000 (00:00 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 16 Jul 2010 22:00:57 +0000 (00:00 +0200)

Trivial merge