From: vsr Date: Tue, 5 Jun 2012 12:28:44 +0000 (+0000) Subject: Merge from V6_5_BR 05/06/2012 X-Git-Tag: V6_main_20120606 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=dd0d9792bcb5ddd5745aba6c5370276feceea077;p=modules%2Fvisu.git Merge from V6_5_BR 05/06/2012 --- diff --git a/Makefile.am b/Makefile.am index 7397b5cb..aa6c4da9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/VISU_version.h.in b/VISU_version.h.in index e4f1a82f..1ebfe375 100644 --- a/VISU_version.h.in +++ b/VISU_version.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am index 2bc4a55b..6d9ac170 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/adm_local/cmake_files/FindVISU.cmake b/adm_local/cmake_files/FindVISU.cmake index 680141c8..4b1a6284 100644 --- a/adm_local/cmake_files/FindVISU.cmake +++ b/adm_local/cmake_files/FindVISU.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/adm_local/cmake_files/Makefile.am b/adm_local/cmake_files/Makefile.am index 91a88024..31ae07ca 100644 --- a/adm_local/cmake_files/Makefile.am +++ b/adm_local/cmake_files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am index 8451478b..0d5ee76b 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am index 3b937714..2411b62e 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/adm_local/unix/config_files/check_VISU.m4 b/adm_local/unix/config_files/check_VISU.m4 index c4927451..5566101b 100755 --- a/adm_local/unix/config_files/check_VISU.m4 +++ b/adm_local/unix/config_files/check_VISU.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE dnl dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index 21e6ac7a..5475c949 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/bin/Makefile.am b/bin/Makefile.am index abc51148..64ec0dd6 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/build_cmake b/build_cmake index a0bd86aa..2b051c79 100755 --- a/build_cmake +++ b/build_cmake @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/build_cmake.bat b/build_cmake.bat index 166b3651..27a44a57 100644 --- a/build_cmake.bat +++ b/build_cmake.bat @@ -1,4 +1,4 @@ -@REM Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +@REM Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE @REM @REM This library is free software; you can redistribute it and/or @REM modify it under the terms of the GNU Lesser General Public diff --git a/build_configure b/build_configure index 68c4d2fc..b20b5116 100755 --- a/build_configure +++ b/build_configure @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/clean_configure b/clean_configure index 7bb2643d..1f4c3ce9 100755 --- a/clean_configure +++ b/clean_configure @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/configure.ac b/configure.ac index 9d8a1df9..0ffd4122 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -23,7 +23,7 @@ # Modified by : Marc Tajchman (CEA) # Modified by : Mikhail Ponikarov (OCN) # -AC_INIT([Salome2 Project VISU module], [6.4.0], [webmaster.salome@opencascade.com], [SalomeVISU]) +AC_INIT([Salome2 Project VISU module], [6.5.0], [webmaster.salome@opencascade.com], [SalomeVISU]) AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET diff --git a/doc/Makefile.am b/doc/Makefile.am index e5da9fe4..33f75b3b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am index 5b409d38..2c8ec67d 100644 --- a/doc/salome/Makefile.am +++ b/doc/salome/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am index 61237e12..05321bf8 100644 --- a/doc/salome/gui/Makefile.am +++ b/doc/salome/gui/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/doc/salome/gui/VISU/Makefile.am b/doc/salome/gui/VISU/Makefile.am index bad42870..43656b0b 100644 --- a/doc/salome/gui/VISU/Makefile.am +++ b/doc/salome/gui/VISU/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/doc/salome/gui/VISU/doxyfile.in b/doc/salome/gui/VISU/doxyfile.in index fcfadf14..cf9480ca 100755 --- a/doc/salome/gui/VISU/doxyfile.in +++ b/doc/salome/gui/VISU/doxyfile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/doc/salome/gui/VISU/doxyfile_idl.in b/doc/salome/gui/VISU/doxyfile_idl.in index 4738e544..b5df57ad 100755 --- a/doc/salome/gui/VISU/doxyfile_idl.in +++ b/doc/salome/gui/VISU/doxyfile_idl.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/doc/salome/gui/VISU/images/featureedgesprops.png b/doc/salome/gui/VISU/images/featureedgesprops.png new file mode 100755 index 00000000..13aa470f Binary files /dev/null and b/doc/salome/gui/VISU/images/featureedgesprops.png differ diff --git a/doc/salome/gui/VISU/images/ppref0.png b/doc/salome/gui/VISU/images/ppref0.png new file mode 100755 index 00000000..d984287a Binary files /dev/null and b/doc/salome/gui/VISU/images/ppref0.png differ diff --git a/doc/salome/gui/VISU/images/ppref1.png b/doc/salome/gui/VISU/images/ppref1.png new file mode 100755 index 00000000..45262f50 Binary files /dev/null and b/doc/salome/gui/VISU/images/ppref1.png differ diff --git a/doc/salome/gui/VISU/images/ppref2.png b/doc/salome/gui/VISU/images/ppref2.png new file mode 100755 index 00000000..caae528b Binary files /dev/null and b/doc/salome/gui/VISU/images/ppref2.png differ diff --git a/doc/salome/gui/VISU/images/ppref3.png b/doc/salome/gui/VISU/images/ppref3.png new file mode 100755 index 00000000..32e05f93 Binary files /dev/null and b/doc/salome/gui/VISU/images/ppref3.png differ diff --git a/doc/salome/gui/VISU/images/pref31.png b/doc/salome/gui/VISU/images/pref31.png new file mode 100755 index 00000000..86555668 Binary files /dev/null and b/doc/salome/gui/VISU/images/pref31.png differ diff --git a/doc/salome/gui/VISU/images/pref32.png b/doc/salome/gui/VISU/images/pref32.png new file mode 100755 index 00000000..efadf97f Binary files /dev/null and b/doc/salome/gui/VISU/images/pref32.png differ diff --git a/doc/salome/gui/VISU/images/pref33.png b/doc/salome/gui/VISU/images/pref33.png new file mode 100755 index 00000000..4a516496 Binary files /dev/null and b/doc/salome/gui/VISU/images/pref33.png differ diff --git a/doc/salome/gui/VISU/images/pref34.png b/doc/salome/gui/VISU/images/pref34.png new file mode 100755 index 00000000..515b09c4 Binary files /dev/null and b/doc/salome/gui/VISU/images/pref34.png differ diff --git a/doc/salome/gui/VISU/images/pref35.png b/doc/salome/gui/VISU/images/pref35.png new file mode 100755 index 00000000..77d73a09 Binary files /dev/null and b/doc/salome/gui/VISU/images/pref35.png differ diff --git a/doc/salome/gui/VISU/images/pref37.png b/doc/salome/gui/VISU/images/pref37.png new file mode 100755 index 00000000..ec0607c9 Binary files /dev/null and b/doc/salome/gui/VISU/images/pref37.png differ diff --git a/doc/salome/gui/VISU/input/index.doc b/doc/salome/gui/VISU/input/index.doc index 4190c983..2eeed373 100644 --- a/doc/salome/gui/VISU/input/index.doc +++ b/doc/salome/gui/VISU/input/index.doc @@ -13,6 +13,8 @@ A MED file contains the description of a \subpage med_object_page "MED object", \subpage table_presentations_page "Data Table Objects", two-dimensional data arrays, as input type for visualization. +Post-Pro module preferences are described in the \subpage postpro_preferences_page section of SALOME Post-Pro Help. + \n The Python interface of \b Post-Pro module is described in \subpage idl_interface_page "Access to Post-Pro module functionality" page. \n Sample Python scripts can be found in \subpage python_examples_page chapter. diff --git a/doc/salome/gui/VISU/input/postpro_preferences.doc b/doc/salome/gui/VISU/input/postpro_preferences.doc new file mode 100644 index 00000000..3930ed8d --- /dev/null +++ b/doc/salome/gui/VISU/input/postpro_preferences.doc @@ -0,0 +1,396 @@ +/*! + +\page postpro_preferences_page Post-Pro Preferences + +In the Post-Pro module you can set preferences, default settings, +which can be used in later sessions with this module. + +

General Preferences

+ +\image html ppref0.png + + + +

MED import Preferences

+ +\image html ppref1.png + + + +

Scalar Bar Preferences

+ +\image html pref31.png + + + +

Cut Lines Preferences

+ +\image html ppref2.png + + + +

Stream Lines Preferences

+ +\image html pref32.png + + + +

Sweep and Animation Preferences

+ +\image html ppref3.png + + + + +

Representation Preferences

+ +\image html pref33.png + + + +

Tables

+ +\image html pref35.png + + + +

Feature Edges

+ +\image html featureedgesprops.png + +These properties define which contours should be highlighted with +Feature Edges functionality. + + + +

Gauss Points Preferences

+ +\image html pref34.png + + + + + + + + + + + +

Inside and Outside Cursor Preferences allow to set +Primitives, Size and Magnification for the +respective zones. + +

Picking Preferences

+ +\image html pref37.png + + + +*/ diff --git a/doc/salome/gui/VISU/static/footer.html b/doc/salome/gui/VISU/static/footer.html index b344790a..4c89a2ba 100755 --- a/doc/salome/gui/VISU/static/footer.html +++ b/doc/salome/gui/VISU/static/footer.html @@ -3,7 +3,7 @@
- Copyright © 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
+ Copyright © 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
Copyright © 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am index 34f4a33c..ec6aeed3 100644 --- a/doc/salome/tui/Makefile.am +++ b/doc/salome/tui/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -43,4 +43,13 @@ install-data-local: fi; uninstall-local: - rm -rf $(DESTDIR)$(docdir)/tui/VISU + @test -d $(DESTDIR)$(tuidocdir) && chmod -R +w $(DESTDIR)$(tuidocdir) ; \ + for filen in `find $(DESTDIR)$(tuidocdir) -mindepth 1 -maxdepth 1` dummy ; do \ + case $${filen} in \ + dummy ) ;; \ + $(DESTDIR)$(tuidocdir)/docutils ) ;; \ + $(DESTDIR)$(tuidocdir)/head.png ) ;; \ + $(DESTDIR)$(tuidocdir)/visuscreen.png ) ;; \ + * ) echo "removing $${filen}" && rm -rf $${filen} ;; \ + esac ; \ + done diff --git a/doc/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in index 1da7cc7c..d26981a1 100755 --- a/doc/salome/tui/doxyfile.in +++ b/doc/salome/tui/doxyfile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -246,7 +246,7 @@ INCLUDED_BY_GRAPH = NO CALL_GRAPH = NO GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES -DOT_IMAGE_FORMAT = jpg +DOT_IMAGE_FORMAT = png DOT_FONTNAME = Arial DOT_PATH = DOTFILE_DIRS = diff --git a/doc/salome/tui/static/doxygen.css b/doc/salome/tui/static/doxygen.css index 9d051a4b..7a2dcbde 100755 --- a/doc/salome/tui/static/doxygen.css +++ b/doc/salome/tui/static/doxygen.css @@ -732,6 +732,12 @@ div.headertitle padding: 5px 5px 5px 10px; } +.title { + font-size: 150%; + font-weight: bold; + margin: 10px 2px; +} + dl { padding: 0 0 0 10px; diff --git a/doc/salome/tui/static/footer.html b/doc/salome/tui/static/footer.html index d77ef0a3..5b030c02 100755 --- a/doc/salome/tui/static/footer.html +++ b/doc/salome/tui/static/footer.html @@ -6,7 +6,7 @@
-Copyright © 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
+Copyright © 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
Copyright © 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/doc/salome/tui/static/header.html.in b/doc/salome/tui/static/header.html.in index 9792445c..4571b436 100755 --- a/doc/salome/tui/static/header.html.in +++ b/doc/salome/tui/static/header.html.in @@ -2,14 +2,12 @@ + $title - - - - - - +$treeview +$search +$mathjax diff --git a/idl/Makefile.am b/idl/Makefile.am index 28e95c86..fe17f2ef 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -26,6 +26,8 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am BASEIDL_FILES = VISU_Gen.idl +BASEIDL_FILES_PY=$(BASEIDL_FILES:%.idl=%_idl.py) + # This variable defines the files to be installed dist_salomeidl_DATA = $(BASEIDL_FILES) @@ -64,9 +66,15 @@ install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%) $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \ done -# uninstall-local removes too much, but it works in distcheck +# we want to remove only staff generated for IDL files and nothing more uninstall-local: - rm -rf $(DESTDIR)$(salomepythondir)/* + @for modulen in VISU ; do \ + test -d $(DESTDIR)$(salomepythondir)/$${modulen} && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen} ; \ + test -d $(DESTDIR)$(salomepythondir)/$${modulen}__POA && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}__POA" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen}__POA ; \ + done ; \ + for filen in $(BASEIDL_FILES_PY) ; do \ + echo "Removing $(DESTDIR)$(salomepythondir)/$${filen}" && rm -f $(DESTDIR)$(salomepythondir)/$${filen}* ; \ + done mostlyclean-local: clean-idls diff --git a/idl/VISU_Gen.idl b/idl/VISU_Gen.idl index 524e741b..60a44498 100644 --- a/idl/VISU_Gen.idl +++ b/idl/VISU_Gen.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/resources/Makefile.am b/resources/Makefile.am index ceac52c8..bd0a7c2f 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in index 1475871c..ec8da151 100644 --- a/resources/SalomeApp.xml.in +++ b/resources/SalomeApp.xml.in @@ -1,5 +1,5 @@