projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d140b8b
b14c459
)
Merge branch 'master' into terencehill/bot_waypoints
author
terencehill <piuntn@gmail.com>
Sat, 15 Jul 2017 09:44:46 +0000
(11:44 +0200)
committer
terencehill <piuntn@gmail.com>
Sat, 15 Jul 2017 09:44:46 +0000
(11:44 +0200)
1
2
qcsrc/server/sv_main.qc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qcsrc/server/sv_main.qc
Simple merge