projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
63007ac
bfa6aff
)
Merge branch 'master' into terencehill/bot_ai
author
terencehill <piuntn@gmail.com>
Sun, 29 Apr 2018 11:19:30 +0000
(13:19 +0200)
committer
terencehill <piuntn@gmail.com>
Sun, 29 Apr 2018 11:19:30 +0000
(13:19 +0200)
1
2
xonotic-server.cfg
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
xonotic-server.cfg
Simple merge