projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
6f6a9d3
69a2e2b
)
Merge branch 'master' into mirceakitsune/sandbox
author
Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 2 Dec 2011 15:36:48 +0000
(17:36 +0200)
committer
Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 2 Dec 2011 15:36:48 +0000
(17:36 +0200)
Trivial merge