merged with dev

This commit is contained in:
Alberto Griggio
2017-03-19 21:23:07 +01:00
85 changed files with 5752 additions and 1750 deletions

View File

@@ -40,7 +40,7 @@
// Profile name to use for internal values' profile
#define DEFPROFILE_INTERNAL "Neutral"
// Special name for the Dynamic profile
#define DEFPROFILE_DYNAMIC "Dynamic"
#define DEFPROFILE_DYNAMIC "Dynamic"
struct SaveFormat
{
@@ -318,7 +318,7 @@ public:
void setDefaults ();
int readFromFile (Glib::ustring fname);
int saveToFile (Glib::ustring fname);
static bool load ();
static bool load (bool lightweight = false);
static void save ();
// if multiUser=false, send back the global profile path