]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
projects / voretournament / voretournament.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0244b13 7d7a7d9)
Merge branch 'master' into mirceakitsune/voretemple_updates
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 6 Sep 2010 15:30:02 +0000 (18:30 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 6 Sep 2010 15:30:02 +0000 (18:30 +0300)

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