Skip to content
GitLab
Next
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Xonotic
xonotic-data.pk3dir
Repository
xonotic-data.pk3dir
effectinfo.txt
Find file
Blame
History
Permalink
Merge branch 'master' into Mario/buff_updates
· 0e3eea33
Mario
authored
Aug 04, 2015
# Conflicts: # effectinfo.txt # qcsrc/common/notifications.qh # qcsrc/common/stats.qh
0e3eea33