projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3e8e73d
e57fd11
)
Merge branch 'master' into martin-t/okc
author
Martin Taibr <taibr.martin@gmail.com>
Fri, 25 Aug 2017 15:08:43 +0000
(17:08 +0200)
committer
Martin Taibr <taibr.martin@gmail.com>
Fri, 25 Aug 2017 15:08:43 +0000
(17:08 +0200)
1
2
qcsrc/common/mutators/mutator/nades/nades.qc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qcsrc/common/mutators/mutator/nades/nades.qc
Simple merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff