Salome HOME
Merge from V6_main_20120808 08Aug12
authorvsr <vsr@opencascade.com>
Thu, 9 Aug 2012 12:00:50 +0000 (12:00 +0000)
committervsr <vsr@opencascade.com>
Thu, 9 Aug 2012 12:00:50 +0000 (12:00 +0000)
commitaef1fead70912bd39d104bdc9f1dd5c57b99f67c
tree10c3dd7e0375cb6ad3b22739d4a64207b3817868
parente51f00868da0c29b3201c8032cc04f86b64a76b6
Merge from V6_main_20120808 08Aug12
32 files changed:
CALCULATOR_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_CALCULATOR.m4
adm_local/unix/make_common_starter.am
bin/Makefile.am
bin/VERSION.in
bin/myrunSalome.py
bin/runAppli.in
build_configure
clean_configure
configure.ac
doc/Makefile.am
idl/CALCULATOR_Gen.idl
idl/Makefile.am
resources/CALCULATORCatalog.xml.in
resources/CALCULATOR_en.xml
resources/CALCULATOR_fr.xml
resources/Makefile.am
resources/SalomeApp.xml [deleted file]
resources/SalomeApp.xml.in [new file with mode: 0644]
src/CALCULATOR/CALCULATOR.cxx
src/CALCULATOR/CALCULATOR.hxx
src/CALCULATOR/CALCULATOR_TEST.py
src/CALCULATOR/CALCULATOR_TEST_STUDY_WITHOUTIHM.py
src/CALCULATOR/CALCULATOR_TEST_WITHOUTIHM.py
src/CALCULATOR/Makefile.am
src/CALCULATOR/graphe1.py
src/CALCULATOR/graphe1.xml
src/Makefile.am