]> 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: e9608ee 7a6bbb7)
Merge remote-tracking branch 'origin/sev/simpleitems_postfix'
authorRudolf Polzer <divverent@xonotic.org>
Tue, 9 Sep 2014 11:51:34 +0000 (13:51 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 9 Sep 2014 11:51:34 +0000 (13:51 +0200)

Trivial merge