 Lukas W
|
8e8879f735
|
Merge stable-1.1
Conflicts:
include/ConfigManager.h
include/MidiTime.h
include/string_pair_drag.h
src/gui/string_pair_drag.cpp
src/gui/widgets/rubberband.cpp
|
2014-11-10 19:26:59 +01:00 |
|
|
Umcaruje
|
6fb923cba2
|
Correct the program name and site in the descriptions.
|
2014-11-04 22:56:50 +01:00 |
|
|
Vesa
|
bf6659fbb1
|
Merge branch 'stable-1.1'
Conflicts:
src/gui/FileBrowser.cpp
|
2014-09-09 23:55:39 +03:00 |
|
|
Lukas W
|
876642c342
|
FileBrowser rename fixes
|
2014-09-03 11:43:40 +02:00 |
|
|
Lukas W
|
efacfdfae9
|
Rename file_browser.* to FileBrowser.*
|
2014-09-03 11:29:25 +02:00 |
|