projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e1bea92
b746cdd
)
Merge branch 'master' into terencehill/misc_bugfixes
author
terencehill <piuntn@gmail.com>
Sun, 4 Jul 2010 23:08:29 +0000
(
01:08
+0200)
committer
terencehill <piuntn@gmail.com>
Sun, 4 Jul 2010 23:08:29 +0000
(
01:08
+0200)
1
2
defaultXonotic.cfg
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
defaultXonotic.cfg
Simple merge