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

Tests and bugfixes hm #43

Merged
merged 7 commits into from
Feb 10, 2014
Merged

Conversation

hmainzer
Copy link
Collaborator

@hmainzer hmainzer commented Feb 8, 2014

Merge for fixes for #1, #7, #30, #31, #32 and #35

Tests-and-Bugfixes-HM

Conflicts:
	src/main/java/wpBaseline/BaselineView.java
	src/main/java/wpShow/PVTableGUI.java
	src/main/java/wpShow/WPShow.java
	src/main/java/wpShow/WPShowGUI.java
janek-bieser added a commit that referenced this pull request Feb 10, 2014
@janek-bieser janek-bieser merged commit fce0936 into PROJ-WS1314-WBS-DEV Feb 10, 2014
@janek-bieser janek-bieser deleted the Tests-and-Bugfixes-HM branch February 10, 2014 17:24
@hmainzer hmainzer mentioned this pull request Feb 10, 2014
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.

None yet

3 participants