Merge remote branch 'origin/hydro/imps_2015'

diff --cc doc/salome/tui/doxyfile.in
index e488c67dca1b48954111cc3f7086f6be669b6f2b,704c8581674c0f00400e7292637cc6f9220fd045..06f4859d3bce732cc912de3f7133fa5cba124f35
--- 1/doc/salome/tui/doxyfile.in
--- 2/doc/salome/tui/doxyfile.in
+++ b/doc/salome/tui/doxyfile.in
@@@ -47,8 -47,8 +47,8 @@@ INHERIT_DOCS           = YE
  SEPARATE_MEMBER_PAGES  = NO
  TAB_SIZE               = 5
  ALIASES                = 
--OPTIMIZE_OUTPUT_FOR_C  = YES
--OPTIMIZE_OUTPUT_JAVA   = YES
++OPTIMIZE_OUTPUT_FOR_C  = NO
++OPTIMIZE_OUTPUT_JAVA   = NO
  BUILTIN_STL_SUPPORT    = @DOXYGEN_SUPPORT_STL@
  DISTRIBUTE_GROUP_DOC   = NO
  SUBGROUPING            = YES
@@@ -105,6 -105,6 +105,7 @@@ INPUT                  = @PROJECT_SOURC
                         @CMAKE_CURRENT_SOURCE_DIR@/input
  FILE_PATTERNS          = *.idl *.hxx *.cxx *.h *.c *.hh *.cc @DOXYGEN_PYTHON_EXTENSION@ *.doc
  RECURSIVE              = YES
++EXCLUDE                = 
  EXCLUDE_SYMLINKS       = NO
  EXCLUDE_PATTERNS       = 
  EXAMPLE_PATH           = 

diff --cc resources/CMakeLists.txt
Simple merge

diff --cc src/CurveCreator/CurveCreator_TableView.cxx
Simple merge

diff --cc src/CurveCreator/CurveCreator_Widget.cxx
Simple merge

diff --cc src/CurveCreator/CurveCreator_Widget.h
Simple merge

diff --cc src/GEOMGUI/GEOM_images.ts
Simple merge

diff --cc src/GEOMGUI/GEOM_msg_en.ts
Simple merge