projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
32c4c03
e59649d
)
Merge branch 'master' into terencehill/keyhunt
author
terencehill <piuntn@gmail.com>
Sat, 31 Dec 2016 22:00:03 +0000
(23:00 +0100)
committer
terencehill <piuntn@gmail.com>
Sat, 31 Dec 2016 22:00:03 +0000
(23:00 +0100)
1
2
gamemodes.cfg
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/common/notifications/all.inc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
gamemodes.cfg
Simple merge
diff --cc
qcsrc/common/notifications/all.inc
Simple merge
diff --cc
qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
Simple merge