Commit Graph

104 Commits

Author SHA1 Message Date
vsr
08dfebe121 Fix problem with compilation of plugins after integration of bos #24009 2021-03-29 11:56:45 +03:00
eap
03d855b75b bos #24009 Merge gni/adaptation branch (MG-Adapt) 2021-03-26 12:45:00 +03:00
vsr
a274ade365 Copyright update 2021 2021-03-23 17:44:29 +03:00
vsr
13e344b872 Revert wrongly integrated merge
This reverts commit a463e46431, reversing
changes made to 1c35693208.
2021-03-22 10:19:31 +03:00
eap
a463e46431 #23999 EDF 22760 - integration of dev in SMESH (from branch 'gni/adaptation') 2021-03-20 16:01:14 +03:00
vsr
907c315580 bos #23972 [CEA 19980] sphinxcontrib_napoleon is not needed with Sphinx >= 1.3 2021-02-19 09:52:32 +03:00
GERALD NICOLAS
55f658966b Ménage avant intégration 2021-02-01 11:26:34 +01:00
GERALD NICOLAS
665d037f93 Merge branch 'master' into gni/adaptation 2020-12-09 16:11:12 +01:00
rnv
053a6ac9d4 Fatal error if F2C converter is not found. 2020-11-27 15:56:27 +03:00
GERALD NICOLAS
b53cb60aee Merge remote-tracking branch 'origin/master' into gni/adaptation 2020-11-23 16:40:24 +01:00
vsr
c835e6ad6d Merge branch 'V9_6_BR' 2020-11-11 18:57:46 +03:00
vsr
d311ab479f Increment version: 9.6.0 2020-10-16 19:06:19 +03:00
Gérald NICOLAS
b1ea582157 Merge branch 'master' into gni/adaptation 2020-08-28 10:55:33 +02:00
eap
d55dbe18f5 Merge remote-tracking branch 'origin/V9_5_BR'
Conflicts:
	src/SMESH_I/SMESH_Mesh_i.cxx
2020-07-10 19:33:14 +03:00
Gérald NICOLAS
1e51d8ea89 Pilotage des bibliothèques 2020-05-26 09:48:59 +02:00
Gérald NICOLAS
a619ad25da MEDCoupling indispensable 2020-05-25 11:02:20 +02:00
Gérald NICOLAS
a174b69248 Transfert brutal des sources du module HOMARD 2020-05-20 17:28:22 +02:00
vsr
b4be5729e0 Increment version: 9.5.0 2020-05-19 13:29:55 +03:00
vsr
9f9759f50d Include SalomeMacros.cmake with NO_POLICY_SCOPE to apply policies 2020-04-20 12:37:41 +03:00
vsr
94ef875259 Remove CMake warnings: set-up cmake policies globally in SalomeMacros.cmake 2020-04-16 20:36:30 +03:00
vsr
0fc0831670 Copyright update 2020 2020-04-15 18:19:44 +03:00
vsr
d85d605175 Add tests for connection with SHAPERSTUDY 2020-04-13 19:22:14 +03:00
eap
5dcb2f2b46 #17845 [EDF] Modifications of Automatic meshing 2020-01-24 19:09:38 +03:00
vsr
b311e0ddf7 Merge branch 'V9_4_BR' 2019-12-06 16:56:39 +03:00
rnv
f5898e40ff Increment version: 9.4.0 2019-11-06 09:53:23 +03:00
rnv
de3e0ec062 Remove QT4 compatibility. 2019-05-31 16:49:15 +03:00
vsr
ecea056f61 Merge branch 'V9_3_BR' 2019-05-06 14:10:53 +03:00
vsr
550595c56d Increment version: 9.3.0 2019-03-28 09:58:47 +03:00
vsr
385d4cede5 Merge branch 'V9_2_2_BR' 2019-03-05 10:22:59 +03:00
vsr
4ad3dc98c8 Increment version: 9.2.2 2019-02-25 15:57:57 +03:00
vsr
6d32f944a0 Update copyrights 2019-02-14 15:33:05 +03:00
vsr
2e145f7188 Increment version: 9.2.1 2019-02-08 14:26:12 +03:00
vsr
05bdaa6d2e Merge branch 'V9_2_BR' 2018-12-10 17:30:25 +03:00
vsr
e15a3a87cc Increment version: 9.2.0 2018-11-16 11:14:59 +03:00
rnv
9e3de95a12 Increment version: 9.1.0 2018-09-11 17:47:20 +03:00
eap
24412178e1 Typo-fix by Kunda + fix user doc generation 2018-06-19 19:58:29 +03:00
rnv
b7a7d49664 Merge V9_dev branch into master 2018-06-14 14:56:19 +03:00
vsr
f513b3c72c Merge branch 'V8_5_asterstudy' 2018-05-31 17:16:47 +03:00
vsr
bcace202dd Fix misprint 2018-05-11 09:12:53 +03:00
vsr
df4c8718db 0023548: [CEA] Generation of documentation is broken if sphinxcontrib.napolen extension is not available 2018-04-20 11:28:21 +03:00
vsr
d8bc110152 Increment version: 8.5.0 2018-04-20 09:27:53 +03:00
rnv
f0f67c0b47 Redesign SALOME documentation 2018-03-30 18:43:58 +03:00
rnv
97889f80ac Migration to OpenCASCADE CMake configuration 2018-03-05 18:56:23 +03:00
rnv
10191484fe Merge changes from 'master' branch. 2017-12-29 16:20:32 +03:00
rnv
90e0893c89 Merge V8_4_BR branch. 2017-12-13 12:18:31 +03:00
vsr
62a5ed1578 0023492: EDF 15654 - Simple case NETGEN1D2D3D fails
- Additional change to commit f4da288f: set SALOME_SMESH_DYNLOAD_LOCAL option ON by default (temporarily, until better solution isn't found)
2017-11-03 10:23:05 +03:00
Nicolas
f4da288f5a [V84] Fix conflict netgen / netgen contrib in GMSH 2017-10-16 10:53:11 +03:00
eap
678b908f16 Typo fixes http://www.salome-platform.org/forum/forum_10/433845793 2017-10-10 12:28:03 +03:00
eap
85f0b9ca16 Typo fixes http://www.salome-platform.org/forum/forum_10/433845793 2017-10-09 15:28:05 +03:00
vsr
7e498745c6 Increment version: 8.4.0 2017-10-03 11:19:09 +03:00