Alexandre
|
3d46f8a290
|
Merge branch 'coding'
Conflicts:
include/Note.h
include/ProjectVersion.h
include/TimeLineWidget.h
include/Track.h
src/core/Plugin.cpp
src/core/ProjectVersion.cpp
src/core/Song.cpp
src/core/Track.cpp
src/gui/TimeLineWidget.cpp
|
2015-03-01 12:55:58 -03:00 |
|
Alexandre Almeida
|
d04076f44d
|
Update coding conventions on Note.h
|
2015-01-19 23:08:19 -02:00 |
|
Lukas W
|
56055b36b0
|
Merge branch 'master' into ed_refac
Conflicts:
src/gui/editors/PianoRoll.cpp
|
2015-01-11 13:25:55 +01:00 |
|
Jonas Trappenberg
|
87e597510c
|
Minor refactorings and codestyle cleanup.
|
2015-01-11 00:05:25 -08:00 |
|
Alexandre Almeida
|
87f6dd0a03
|
Update coding conventions on Note.h
|
2015-01-05 20:45:46 -02:00 |
|
Lukas W
|
657fb06c49
|
More Automation refactoring
|
2014-12-17 11:34:57 +01:00 |
|
Lukas W
|
aaeb5216ad
|
Rename note to Note
|
2014-11-26 01:14:52 +01:00 |
|