projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ae57b1a
40b2cb6
)
Merge branch 'master' into terencehill/vec2_optimizations
author
terencehill <piuntn@gmail.com>
Sat, 17 Jun 2017 18:18:53 +0000
(20:18 +0200)
committer
terencehill <piuntn@gmail.com>
Sat, 17 Jun 2017 18:18:53 +0000
(20:18 +0200)
1
2
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
Simple merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff