]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
projects / voretournament / voretournament.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6aafc26 5147aee)
Merge branch 'master' into mirceakitsune/weapon_display
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 4 Aug 2011 10:09:30 +0000 (13:09 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 4 Aug 2011 10:09:30 +0000 (13:09 +0300)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.