Merge changes from 'master' branch.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6d89012519791d8295c532f6ca9209a25ff78a2..45c37673723c719f80e9264b1c58b0ec61b5f4c6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
 
 # Common CMake macros
 # ===================

diff --git a/src/ATOMICGUI/ATOMICGUI_DataModel.cxx b/src/ATOMICGUI/ATOMICGUI_DataModel.cxx
index 5e8b4f7be3ffb72283e3495e7f07adbd4e704371..1b9278f1d7882be2e477fbe747580d8216ead60f 100644 (file)
--- a/src/ATOMICGUI/ATOMICGUI_DataModel.cxx
+++ b/src/ATOMICGUI/ATOMICGUI_DataModel.cxx
@@ -400,7 +400,7 @@ bool ATOMICGUI_DataModel::dumpPython( const QString& theURL,
   QString aPrefix = "";
   if(isMultiFile) {
     aScript += "def RebuildData(theStudy):\n";
-    aPrefix = "\t";
+    aPrefix = "    ";
   }
   
   for ( int i = 0; i < myMolecules.count(); i++ ) {