Merge from agy/feedbackads140304

diff --cc src/Plugins/MEDReader/IO/MEDFileFieldRepresentationTree.cxx
Simple merge

diff --cc src/Plugins/MEDReader/IO/MEDFileFieldRepresentationTree.hxx
Simple merge

diff --cc src/Plugins/MEDReader/IO/MEDTimeReq.cxx
Simple merge

diff --cc src/Plugins/MEDReader/IO/MEDTimeReq.hxx
Simple merge

diff --cc src/Plugins/MEDReader/IO/vtkExtractGroup.cxx
Simple merge

diff --cc src/Plugins/MEDReader/IO/vtkExtractGroup.h
Simple merge

diff --cc src/Plugins/MEDReader/IO/vtkGenerateVectors.cxx
Simple merge

diff --cc src/Plugins/MEDReader/IO/vtkGenerateVectors.h
Simple merge

diff --cc src/Plugins/MEDReader/ParaViewPlugin/pqMEDReaderPanel.cxx
Simple merge

diff --cc src/Plugins/MEDReader/Test/CMakeLists.txt
index c07ef8395db6cd76809302e1c0a814eb3393091c,252156048ae123a176f4d50498b82a14e1e08c5d..a184b76c0d0dfd8d050d3666a9f9c0132abfd90f
--- 1/src/Plugins/MEDReader/Test/CMakeLists.txt
--- 2/src/Plugins/MEDReader/Test/CMakeLists.txt
+++ b/src/Plugins/MEDReader/Test/CMakeLists.txt
@@@ -17,22 -17,14 +17,26 @@@
  # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
  #
  
 +SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
  ADD_TEST(testMEDReader0 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader0.py)
 +SET_TESTS_PROPERTIES(testMEDReader0 PROPERTIES ENVIRONMENT "${tests_env}")
  ADD_TEST(testMEDReader1 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader1.py)
 +SET_TESTS_PROPERTIES(testMEDReader1 PROPERTIES ENVIRONMENT "${tests_env}")
  ADD_TEST(testMEDReader2 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader2.py)
 +SET_TESTS_PROPERTIES(testMEDReader2 PROPERTIES ENVIRONMENT "${tests_env}")
  ADD_TEST(testMEDReader3 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader3.py)
 +SET_TESTS_PROPERTIES(testMEDReader3 PROPERTIES ENVIRONMENT "${tests_env}")
  ADD_TEST(testMEDReader4 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader4.py)
 +SET_TESTS_PROPERTIES(testMEDReader4 PROPERTIES ENVIRONMENT "${tests_env}")
  ADD_TEST(testMEDReader5 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader5.py)
 +SET_TESTS_PROPERTIES(testMEDReader5 PROPERTIES ENVIRONMENT "${tests_env}")
  ADD_TEST(testMEDReader6 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader6.py)
 +SET_TESTS_PROPERTIES(testMEDReader6 PROPERTIES ENVIRONMENT "${tests_env}")
  ADD_TEST(testMEDReader7 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader7.py)
 +SET_TESTS_PROPERTIES(testMEDReader7 PROPERTIES ENVIRONMENT "${tests_env}")
  ADD_TEST(testMEDReader8 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader8.py)
 +SET_TESTS_PROPERTIES(testMEDReader8 PROPERTIES ENVIRONMENT "${tests_env}")
+ ADD_TEST(testMEDReader9 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader9.py)
++SET_TESTS_PROPERTIES(testMEDReader9 PROPERTIES ENVIRONMENT "${tests_env}")
+ ADD_TEST(testMEDReader10 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader10.py)
++SET_TESTS_PROPERTIES(testMEDReader10 PROPERTIES ENVIRONMENT "${tests_env}")

diff --cc src/Plugins/MEDReader/Test/testMEDReader0.py
Simple merge