Hyunin Song 0a5d056bdb Merge branch 'stable-1.2' ...

# Conflicts:
        #       .travis/osx..install.sh
        #       .travis/osx..script.sh
        #       cmake/linux/package_linux.sh.in
        #       data/locale/en.ts
        #       src/core/CMakeLists.txt
        #       src/core/ProjectRenderer.cpp
        #       src/gui/FileBrowser.cpp

2018-03-07 23:54:28 +09:00

..

dialogs

Merge branch 'master' into fix/msvc

2017-11-22 17:34:22 +01:00

editors

Merge branch 'stable-1.2'

2018-03-07 23:54:28 +09:00

Forms

Sort effects in dialog with sortable table

2016-06-15 01:42:46 +02:00

widgets

Merge branch 'stable-1.2'

2018-03-07 23:54:28 +09:00

AboutDialog.cpp

MSVC: Show compiler version in AboutDialog

2017-11-22 13:54:19 +01:00

ActionGroup.cpp

update all copyright headers to the proper url (#3326)

2017-02-06 02:41:15 +02:00

AudioAlsaSetupWidget.cpp

Remove unused includes (#3429)

2017-03-16 11:35:18 +00:00

AudioDeviceSetupWidget.cpp

update all copyright headers to the proper url (#3326)

2017-02-06 02:41:15 +02:00

AutomatableModelView.cpp

update all copyright headers to the proper url (#3326)

2017-02-06 02:41:15 +02:00

AutomationPatternView.cpp

Merge brnach 'stable-1.2'

2017-11-24 09:56:08 +09:00

CMakeLists.txt

Move X11EmbedContainer to submodule

2017-09-01 12:20:20 +02:00

ControllerConnectionDialog.cpp

Remove unused includes (#3429)

2017-03-16 11:35:18 +00:00

ControllerDialog.cpp

update all copyright headers to the proper url (#3326)

2017-02-06 02:41:15 +02:00

EffectControlDialog.cpp

Remove unused includes (#3429)

2017-03-16 11:35:18 +00:00

EffectSelectDialog.cpp

adds clear button to line edits on 'add FX' and 'side bar browser' (#3329)

2017-02-13 19:05:05 +01:00

embed.cpp

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

ExportProjectDialog.cpp

Merge branch 'stable-1.2'

2018-03-07 23:54:28 +09:00

FileBrowser.cpp

Merge branch 'stable-1.2'

2018-03-07 23:54:28 +09:00

FxMixerView.cpp

Unsolo mixer channels on delete (#3982)

2017-11-21 20:56:54 +01:00

GuiApplication.cpp

Merge branch 'stable-1.2'

2017-10-03 15:56:16 +09:00

InstrumentView.cpp

Remove unused includes (#3429)

2017-03-16 11:35:18 +00:00

LfoControllerDialog.cpp

Remove unused includes (#3429)

2017-03-16 11:35:18 +00:00

LmmsPalette.cpp

Remove unused includes (#3429)

2017-03-16 11:35:18 +00:00

LmmsStyle.cpp

Remove unused includes (#3429)

2017-03-16 11:35:18 +00:00

MainApplication.cpp

Disable plugin transparency on Qt5 (#3934)

2017-11-13 08:52:08 +09:00

MainWindow.cpp

Remove Song's dependency to MainWindow

2017-12-26 00:33:11 +01:00

MidiSetupWidget.cpp

update all copyright headers to the proper url (#3326)

2017-02-06 02:41:15 +02:00

ModelView.cpp

update all copyright headers to the proper url (#3326)

2017-02-06 02:41:15 +02:00

PeakControllerDialog.cpp

Remove unused includes (#3429)

2017-03-16 11:35:18 +00:00

PianoView.cpp

Remove unused includes (#3429)

2017-03-16 11:35:18 +00:00

PluginBrowser.cpp

UI: New behavior for the Plugin Browser (#3773)

2017-11-15 00:08:48 -05:00

RowTableView.cpp

update all copyright headers to the proper url (#3326)

2017-02-06 02:41:15 +02:00

SetupDialog.cpp

VST: Fix Qt4 compilation

2017-11-24 12:46:06 +01:00

StringPairDrag.cpp

Remove unused includes (#3429)

2017-03-16 11:35:18 +00:00

SubWindow.cpp

Merge branch 'stable-1.2'

2017-12-20 14:16:16 +09:00

TimeLineWidget.cpp

Fix time display (#3711)

2017-11-14 23:42:26 -05:00

ToolPluginView.cpp

Remove unused includes (#3429)

2017-03-16 11:35:18 +00:00

TrackContainerView.cpp

Merge branch 'stable-1.2'

2018-03-07 23:54:28 +09:00