]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 39380aa 15ad487)
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Fri, 30 Aug 2013 08:00:07 +0000 (10:00 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 30 Aug 2013 08:00:07 +0000 (10:00 +0200)

Trivial merge