projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6b3f7d6
bbed0d9
)
Merge branch 'master' into terencehill/bot_waypoints
author
terencehill <piuntn@gmail.com>
Fri, 1 Dec 2017 14:39:56 +0000
(15:39 +0100)
committer
terencehill <piuntn@gmail.com>
Fri, 1 Dec 2017 14:39:56 +0000
(15:39 +0100)
1
2
qcsrc/common/triggers/teleporters.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/triggers/trigger/jumppads.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/server/bot/default/havocbot/roles.qc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qcsrc/common/triggers/teleporters.qc
Simple merge
diff --cc
qcsrc/common/triggers/trigger/jumppads.qc
Simple merge
diff --cc
qcsrc/server/bot/default/havocbot/roles.qc
Simple merge