]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
projects / voretournament / voretournament.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 264addf 6356315)
Merge branch 'master' into mirceakitsune/macro_walk_effects
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 3 Mar 2012 14:52:58 +0000 (16:52 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 3 Mar 2012 14:52:58 +0000 (16:52 +0200)

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