]> 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: d6f4b04 b7cc21c)
Merge remote-tracking branch 'origin/Mario/lsmaps_count'
authorRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:14:38 +0000 (11:14 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:14:38 +0000 (11:14 +0200)
* origin/Mario/lsmaps_count:
  Show number of maps in lsmaps reply


Trivial merge