Skip to content
GitLab
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Primary navigation
Search or go to…
Project
X
xonotic-data.pk3dir
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Privacy statement
Keyboard shortcuts
?
What's new
6
Snippets
Groups
Projects
Show more breadcrumbs
Xonotic
xonotic-data.pk3dir
Commits
1812e2b6
Commit
1812e2b6
authored
8 years ago
by
Mario
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into Mario/monsters
parents
b1ac6c2f
ea3f94a4
No related branches found
No related tags found
Loading
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
qcsrc/server/command/vote.qc
+18
-20
18 additions, 20 deletions
qcsrc/server/command/vote.qc
qcsrc/server/mutators/mutator/gamemode_invasion.qc
+2
-1
2 additions, 1 deletion
qcsrc/server/mutators/mutator/gamemode_invasion.qc
qcsrc/server/round_handler.qc
+1
-2
1 addition, 2 deletions
qcsrc/server/round_handler.qc
with
21 additions
and
23 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
