Merged
Conversation
Also a few warnings excluded from Makefile_Visual (for Visual C++ 2010)
Renamed ABstats to ABStats to please one specific compiler. Test fp == nullptr before flcose, shouldn't be necessary, failed one tester on ArchLinux. Fixed move output in debug mode by deleting PlyToText and adding Moves::TrickToText. Fixed bug in CalcTables affecting par outputs. Fixed bug in mode targets -1 solutions 1, probably old, occurring when 0 tricks are possible. Retabbed.
Contributor
|
You should see this saying "This pull request can be automatically merged". If the dependencies were weirder, and some conflicting commits had been added onto develop while you were working...you wouldn't get that offer. So if your pull request added a line to a file that got deleted, for example. :-/ In that case you'd have to do merging and conflict resolution with SourceTree instead of just pushing a button in GitHub. That's a different set of functionality, but fortunately you don't have to deal with that just yet...! |
sorenhein
added a commit
that referenced
this pull request
Nov 26, 2014
sorenhein
added a commit
that referenced
this pull request
Jun 29, 2015
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Updates to bring the v2.8 beta up to release status (hopefully).