projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
43f73d2
1852dd0
)
Merge branch 'master' into terencehill/min_spec_time
author
terencehill <piuntn@gmail.com>
Fri, 6 Apr 2018 19:44:53 +0000
(21:44 +0200)
committer
terencehill <piuntn@gmail.com>
Fri, 6 Apr 2018 19:44:53 +0000
(21:44 +0200)
1
2
qcsrc/server/client.qc
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/server/mutators/events.qh
patch
|
diff1
|
diff2
|
blob
|
history
qcsrc/server/mutators/mutator/gamemode_lms.qc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qcsrc/server/client.qc
Simple merge
diff --cc
qcsrc/server/mutators/events.qh
Simple merge
diff --cc
qcsrc/server/mutators/mutator/gamemode_lms.qc
Simple merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff