projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a35ef4f
bbf7625
)
Merge remote branch 'origin/master' into samual/updatecommands
author
Samual <samual@xonotic.org>
Thu, 11 Aug 2011 08:19:14 +0000
(
04:19
-0400)
committer
Samual <samual@xonotic.org>
Thu, 11 Aug 2011 08:19:14 +0000
(
04:19
-0400)
1
2
defaultXonotic.cfg
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
defaultXonotic.cfg
Simple merge