Merge remote-tracking branch 'upstream/release/2013.03' into make-io-subdir

2013-03-12 10:46:58 +01:00
parent c2a7ce9a45 d0004fcd76
commit 2f99316d01
8 changed files with 21 additions and 33 deletions
--- a/tutorials/tutorial4.cpp
+++ b/tutorials/tutorial4.cpp
@@ -1,4 +1,5 @@
-/*
+/*!
+\cond SKIP
  Copyright 2012 SINTEF ICT, Applied Mathematics.

  This file is part of the Open Porous Media project (OPM).
@@ -15,9 +16,8 @@

  You should have received a copy of the GNU General Public License
  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+\endcond
 */
-
-
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H