zynaddsubfx

commit 02b543b7fd519e8eba8aed2c85090f0941cce0b2
parent 7e6a2a90b200732dd7481bd4d4de3ef73e0f08e8
Author: fundamental <mark.d.mccurry@gmail.com>
Date:   Thu, 13 May 2010 18:18:19 -0400

Fixing merge

Diffstat:
M
src/Params/PresetsStore.cpp
 | 
2
+-
M
src/Params/PresetsStore.h
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Params/PresetsStore.cpp b/src/Params/PresetsStore.cpp
@@ -138,7 +138,7 @@ void PresetsStore::rescanforpresets(string type)
 }
 
 
-void PresetsStore::copypreset(XMLwrapper *xml, char *type, const string name)
+void PresetsStore::copypreset(XMLwrapper *xml, char *type, string name)
 {
     if(config.cfg.presetsDirList[0] == NULL)
         return;
diff --git a/src/Params/PresetsStore.h b/src/Params/PresetsStore.h
@@ -39,7 +39,7 @@ class PresetsStore
         bool checkclipboardtype(char *type);
 
         //presets stuff
-        void copypreset(XMLwrapper *xml, char *type, const std::string name);
+        void copypreset(XMLwrapper *xml, char *type, std::string name);
         bool pastepreset(XMLwrapper *xml, int npreset);
         void deletepreset(int npreset);