]> git.xonotic.org Git - voretournament/voretournament.git/commitdiff
projects / voretournament / voretournament.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2740a16 f2703e5)
Merge branch 'master' into mirceakitsune/voretournament-campaign
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 13 Sep 2010 23:35:50 +0000 (02:35 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 13 Sep 2010 23:35:50 +0000 (02:35 +0300)

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