]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
projects / voretournament / voretournament.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e7aaf8 64dea53)
Merge branch 'master' into mirceakitsune/portraits mirceakitsune/portraits
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 30 Jan 2012 20:40:07 +0000 (22:40 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 30 Jan 2012 20:40:07 +0000 (22:40 +0200)

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