projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9bb27ae
2ed18f8
)
Merge branch 'master' into Mario/mapinfo_title_fix
author
Mario <mario@smbclan.net>
Sun, 21 Oct 2018 16:52:27 +0000
(
02:52
+1000)
committer
Mario <mario@smbclan.net>
Sun, 21 Oct 2018 16:52:27 +0000
(
02:52
+1000)
1
2
qcsrc/common/mapinfo.qc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qcsrc/common/mapinfo.qc
Simple merge