]> 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: 2c72ba3 35528e9)
Merge branch 'Mario/use1' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 30 Apr 2016 07:24:03 +0000 (07:24 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 30 Apr 2016 07:24:03 +0000 (07:24 +0000)
Merge branch Mario/use1 (XL merge request)

Cleans out the use of self from .use, a necessary step towards supporting the Daemon engine and NaCl.

See merge request !298


Trivial merge