projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2f2f32c
fbaa95e
)
Merge branch 'master' into nyov/dedicated-startupscreen
author
nyov <nyov@nexnode.net>
Sat, 3 Dec 2011 19:16:14 +0000
(20:16 +0100)
committer
nyov <nyov@nexnode.net>
Sat, 3 Dec 2011 19:16:14 +0000
(20:16 +0100)
1
2
defaultXonotic.cfg
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
defaultXonotic.cfg
Simple merge