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.

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

Futurator redesign proper #141

Merged
merged 8 commits into from Jan 19, 2016
Merged

Conversation

@annejan
Copy link
Member

@annejan annejan commented Jan 18, 2016

Let's do this the "github" way . .

@termitoz
Copy link

@termitoz termitoz commented Jan 18, 2016

what I must do for chek it OK ?

@annejan
Copy link
Member Author

@annejan annejan commented Jan 18, 2016

Nothing, ignore linthub and I'll find out what went wrong with appveyour tomorrow :-)

@termitoz
Copy link

@termitoz termitoz commented Jan 18, 2016

ok =) maye its because I removed progressbar.h from project?

@annejan
Copy link
Member Author

@annejan annejan commented Jan 19, 2016

There is a merge-conflict since I swapped the up (now push) and down (now pull) arrows.

@annejan annejan merged commit 6b821a5 into IJHack:futurator-redesign Jan 19, 2016
0 of 2 checks passed
0 of 2 checks passed
linthub Linthub has found some code style suggestions while reviewing the pull request.
Details
continuous-integration/appveyor/pr AppVeyor was unable to build non-mergeable pull request
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants