From: vsr <vsr@opencascade.com>
Date: Fri, 21 Oct 2016 09:20:48 +0000 (+0300)
Subject: Merge remote branch 'origin/hydro/imps_2015'
X-Git-Tag: V8_2_0a1^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ec168c32f86cab8199030ec4e8e2b1cbd5e42670;p=modules%2Fgeom.git

Merge remote branch 'origin/hydro/imps_2015'
---

ec168c32f86cab8199030ec4e8e2b1cbd5e42670
diff --cc doc/salome/tui/doxyfile.in
index e488c67dc,704c85816..06f4859d3
--- a/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           =