Join modifications from branch BR_3_1_0deb

diff --git a/bin/VERSION b/bin/VERSION
index d9164141df56a477a3cff8d626fb3ae0a1f4d7c5..d35059c40a2774bcb1344e0315a7b75b7c4f7bb1 100755 (executable)
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1,2 +1,2 @@
-SALOME 2 EXEMPLE MODULE C++ - CALCULATOR VERSION: 3.1.0b1
-This module works with KERNEL 3.1.0b1
+SALOME 2 EXEMPLE MODULE C++ - CALCULATOR VERSION: 3.1.0
+This module works with KERNEL 3.1.0

diff --git a/resources/CALCULATORCatalog.xml b/resources/CALCULATORCatalog.xml
index 5094fcb0f65762e78389aa64578bb817b1068621..ec83940a4f6eecebc4be682349ef63026d76b4b7 100644 (file)
--- a/resources/CALCULATORCatalog.xml
+++ b/resources/CALCULATORCatalog.xml
@@ -8,7 +8,7 @@
             <component-username>CALCULATOR</component-username>
             <component-type>MED EXAMPLE</component-type>
             <component-author>crouzet</component-author>
-            <component-version>3.1.0b1</component-version>
+            <component-version>3.1.0</component-version>
             <component-comment>unknown</component-comment>
             <component-multistudy>1</component-multistudy>
             <component-icone>CALCULATOR.png</component-icone>