projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fd94897
5bea997
)
Merge remote-tracking branch 'origin/terencehill/campaign_with_cheats_fix'
author
Mario <mario@smbclan.net>
Fri, 22 Jul 2016 17:03:54 +0000
(
03:03
+1000)
committer
Mario <mario@smbclan.net>
Fri, 22 Jul 2016 17:03:54 +0000
(
03:03
+1000)
Trivial merge