liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with dev

Browse Source
This commit is contained in:
Desmis
2018-01-22 08:56:24 +01:00
parent 6cdbba2a0f 5342e75289
commit cef451807d
35 changed files with 1066 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtgui/toolpanelcoord.h
View File

@@ -162,7 +162,7 @@ protected:
ToolVBox* colorPanel;
ToolVBox* transformPanel;
ToolVBox* rawPanel;
ToolVBox* waveletPanel;
ToolVBox* advancedPanel;
//<<<<<<< HEAD
ToolVBox* locallabPanel;
// Gtk::Notebook* metadataPanel;
@@ -189,7 +189,7 @@ protected:
Gtk::ScrolledWindow* colorPanelSW;
Gtk::ScrolledWindow* transformPanelSW;
Gtk::ScrolledWindow* rawPanelSW;
Gtk::ScrolledWindow* waveletPanelSW;
Gtk::ScrolledWindow* advancedPanelSW;
Gtk::ScrolledWindow* locallabPanelSW;
std::vector<MyExpander*> expList;