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

[G4] Instrument implementations #401

Merged

Conversation

sydneyhauke
Copy link

Fixes all issues for group G4. Fixes #337 #330 #349 #310 #396 #363 #348 #347

Tano and others added 30 commits March 6, 2017 12:43
…HEIGVD-RES-2017-Labo-00 into fb-all-instruments
…HEIGVD-RES-2017-Labo-00 into fb-marimba-implementation
…ng-HEIGVD-RES-2017-Labo-00 into fb-all-instruments
@wasadigi
Copy link
Member

wasadigi commented Mar 9, 2017

Nice :-). Just a couple of things before I accept the PR:

  • you have extra files (Trumpet, Instrument, etc.)
  • you have some files with headers generated by the IDE

Up to you if you want to ask your team mates to do the change, or if you handle the integration yourself. Thanks!

@wasadigi
Copy link
Member

wasadigi commented Mar 9, 2017

You probably have not added/commited everything: I only see the header removed from Mandolin.java.

@wasadigi
Copy link
Member

wasadigi commented Mar 9, 2017

Sorry to be picky, but the last 2 files still have the headers...

@sydneyhauke
Copy link
Author

Did not see those, sorry. Next commit to come should be fine (at last).

Copy link
Member

@wasadigi wasadigi left a comment

Choose a reason for hiding this comment

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

Great work, thanks!

@wasadigi wasadigi merged commit 71a6ca0 into SoftEng-HEIGVD:fb-all-instruments Mar 9, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants