Merge multi-study removal branch.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fcd6bbeb6c284ff4a2666cfee36ab5833e92cea..3cd0d1ded7d89a54e8268d0022b8f3b4b9728f27 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ ENDIF(WIN32)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 1)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
 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})

diff --git a/src/ATOMSOLV/ATOMSOLV.cxx b/src/ATOMSOLV/ATOMSOLV.cxx
index b5f510cfdbdf1ac100a8c228f95fa3f248818785..282d82aa36278135324c251e65a3800c6f4cf62f 100755 (executable)
--- a/src/ATOMSOLV/ATOMSOLV.cxx
+++ b/src/ATOMSOLV/ATOMSOLV.cxx
@@ -36,6 +36,7 @@ ATOMSOLV::ATOMSOLV(CORBA::ORB_ptr orb,
   MESSAGE("activate object");
   _thisObj = this ;
   _id = _poa->activate_object(_thisObj);
+  myData = new ATOMSOLV_ORB::TMoleculeList();
 }
 
 ATOMSOLV::~ATOMSOLV()