]> git.xonotic.org Git - voretournament/voretournament.git/commitdiff
projects / voretournament / voretournament.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92e4fa1 e853e92)
Merge branch 'master' into mirceakitsune/envmap mirceakitsune/envmap
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 28 Jan 2012 20:44:33 +0000 (22:44 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 28 Jan 2012 20:44:33 +0000 (22:44 +0200)

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