Skip to content

Getting dev up to master#7

Merged
jhaenchen merged 30 commits intoDevelopmentfrom
master
Oct 12, 2014
Merged

Getting dev up to master#7
jhaenchen merged 30 commits intoDevelopmentfrom
master

Conversation

@jhaenchen
Copy link
Owner

Why do I have to make a pull request?

jhaenchen and others added 30 commits October 9, 2014 12:20
Refactoring classes into different files
Refactoring classes into different files
Added gitignore default file and removed dirs that should not be
included
Added gitignore default file
Refactoring classes into different files
Rafactoring and general cleanup
Updated the close menu item so that it functions. More refactoring.
Updated File>Close menu item, now works
Conflicts:
	MicAndNotes/MicAndNotes/bin/Release/MicAndNotes.exe
	MicAndNotes/MicAndNotes/bin/Release/MicAndNotes.pdb
	MicAndNotes/MicAndNotes/bin/Release/Release.zip
	MicAndNotes/MicAndNotes/obj/Release/MicAndNotes.exe
	MicAndNotes/MicAndNotes/obj/Release/MicAndNotes.pdb
… append data, then click update section. At that point click save.
Made the slider attempt to keep up with the playback recording
jhaenchen added a commit that referenced this pull request Oct 12, 2014
Getting dev up to master
@jhaenchen jhaenchen merged commit cda4144 into Development Oct 12, 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.

2 participants