merge wit dev
This commit is contained in:
@@ -24,8 +24,11 @@
|
||||
#include "addsetids.h"
|
||||
#include "../rtengine/dfmanager.h"
|
||||
#include "../rtengine/ffmanager.h"
|
||||
#include "../rtengine/iccstore.h"
|
||||
#include "../rtengine/procparams.h"
|
||||
#include <sstream>
|
||||
#include "rtimage.h"
|
||||
#include "rtwindow.h"
|
||||
#ifdef _OPENMP
|
||||
#include <omp.h>
|
||||
#endif
|
||||
@@ -49,7 +52,6 @@ void placeSpinBox(Gtk::Container* where, Gtk::SpinButton* &spin, const std::stri
|
||||
}
|
||||
}
|
||||
|
||||
extern Options options;
|
||||
extern Glib::ustring argv0;
|
||||
Glib::RefPtr<Gtk::CssProvider> themecss;
|
||||
Glib::RefPtr<Gtk::CssProvider> fontcss;
|
||||
|
Reference in New Issue
Block a user