Salome HOME
Merge from V6_main 01/04/2013 V7_2_0b1
authorvsr <vsr@opencascade.com>
Mon, 1 Apr 2013 13:06:48 +0000 (13:06 +0000)
committervsr <vsr@opencascade.com>
Mon, 1 Apr 2013 13:06:48 +0000 (13:06 +0000)
commit3275b1abf75b243732fe1a5ea9f3a772bd9a58c7
treefe07bdcf0985f033aa3608fb21ba44c8f97816ae
parent66933a778c7206f224345efccbe526819de76a9e
Merge from V6_main 01/04/2013
44 files changed:
ATOMIC_version.h.in
Makefile.am
adm_local/Makefile.am
adm_local/unix/Makefile.am
adm_local/unix/config_files/Makefile.am
adm_local/unix/config_files/check_ATOMIC.m4
adm_local/unix/make_common_starter.am
bin/Makefile.am
build_configure
clean_configure
configure.ac
resources/LightApp.xml
resources/Makefile.am
resources/SalomeApp.xml.in
src/ATOMICGUI/ATOMICGUI.cxx
src/ATOMICGUI/ATOMICGUI.h
src/ATOMICGUI/ATOMICGUI_AddAtomDlg.cxx
src/ATOMICGUI/ATOMICGUI_AddAtomDlg.h
src/ATOMICGUI/ATOMICGUI_AddAtomOp.cxx
src/ATOMICGUI/ATOMICGUI_AddAtomOp.h
src/ATOMICGUI/ATOMICGUI_CreateMolOp.cxx
src/ATOMICGUI/ATOMICGUI_CreateMolOp.h
src/ATOMICGUI/ATOMICGUI_Data.cxx
src/ATOMICGUI/ATOMICGUI_Data.h
src/ATOMICGUI/ATOMICGUI_DataModel.cxx
src/ATOMICGUI/ATOMICGUI_DataModel.h
src/ATOMICGUI/ATOMICGUI_DataObject.cxx
src/ATOMICGUI/ATOMICGUI_DataObject.h
src/ATOMICGUI/ATOMICGUI_DeleteOp.cxx
src/ATOMICGUI/ATOMICGUI_DeleteOp.h
src/ATOMICGUI/ATOMICGUI_ImportExportOp.cxx
src/ATOMICGUI/ATOMICGUI_ImportExportOp.h
src/ATOMICGUI/ATOMICGUI_Operation.cxx
src/ATOMICGUI/ATOMICGUI_Operation.h
src/ATOMICGUI/ATOMICGUI_RenameOp.cxx
src/ATOMICGUI/ATOMICGUI_RenameOp.h
src/ATOMICGUI/ATOMICGUI_Selection.cxx
src/ATOMICGUI/ATOMICGUI_Selection.h
src/ATOMICGUI/Makefile.am
src/AtomicPy/AtomicPy.cxx
src/AtomicPy/AtomicPy.h
src/AtomicPy/AtomicPy.sip
src/AtomicPy/Makefile.am
src/Makefile.am