Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed a typo in the airFriction generator script #5641

Merged
merged 1 commit into from
Oct 20, 2017
Merged

Fixed a typo in the airFriction generator script #5641

merged 1 commit into from
Oct 20, 2017

Conversation

ulteq
Copy link
Contributor

@ulteq ulteq commented Oct 20, 2017

  • Slightly improves the vanilla trajectory of the 'ACE_338_Ball' bullet

@ulteq
Fixed a typo in the airFriction generator script
ea783f8 
- Slightly improves the vanilla trajectory of the 'ACE_338_Ball' bullet
@ulteq ulteq added ignore-changelog Release Notes: Excluded impact/trivial kind/bug-fix Release Notes: **FIXED:** labels Oct 20, 2017
@ulteq ulteq added this to the 3.11.0 milestone Oct 20, 2017
bux
bux previously requested changes Oct 20, 2017
View reviewed changes
Copy link
Member

@bux bux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change target into release branch

@commy2 commy2 changed the base branch from master to release-3.11.0 October 20, 2017 15:18
@commy2
Copy link
Contributor

commy2 commented Oct 20, 2017

: /

@commy2 commy2 changed the base branch from release-3.11.0 to master October 20, 2017 15:19
@jonpas jonpas dismissed bux’s stale review October 20, 2017 15:33

Not exactly gitflow, but easier to just pull from master right now as nothing else was committed.

@jonpas jonpas merged commit 61c044e into master Oct 20, 2017
@jonpas jonpas deleted the ammo-config-typo-fix branch October 20, 2017 15:33
@jonpas jonpas removed the ignore-changelog Release Notes: Excluded label Oct 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonpas jonpas jonpas approved these changes

@bux bux bux left review comments

Assignees
No one assigned
Labels
impact/trivial kind/bug-fix Release Notes: **FIXED:**
Projects
None yet
Milestone
3.11.0
Development

Successfully merging this pull request may close these issues.
4 participants
@ulteq @commy2 @bux @jonpas