merge with dev

2018-02-15 16:57:23 +01:00
parent 96c49a3086 20fcffae94
commit 9916cdb4b0
61 changed files with 201 additions and 4414 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1627,7 +1627,7 @@ private:
  * saving too)
  *
  * PartialProfile is not responsible of ProcParams and ParamsEdited object creation
-  * and hence is not responsible of their destructions. The function that instanciate
+  * and hence is not responsible of their destructions. The function that instantiate
  * PartialProfile object has to handle all this itself.
  */
 class PartialProfile :