]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ddd00d 821a951)
Merge branch 'terencehill/registry_API' into 'master'
authorMario <mario.mario@y7mail.com>
Fri, 29 May 2020 09:46:59 +0000 (09:46 +0000)
committerMario <mario.mario@y7mail.com>
Fri, 29 May 2020 09:46:59 +0000 (09:46 +0000)
Registry API

See merge request xonotic/xonotic-data.pk3dir!821

1  2 
qcsrc/client/main.qc patch | diff1 | diff2 | blob | history
qcsrc/client/view.qc patch | diff1 | diff2 | blob | history
qcsrc/common/t_items.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/main.qc
Simple merge
diff --cc qcsrc/client/view.qc
Simple merge
diff --cc qcsrc/common/t_items.qc
Simple merge