From 694bff2f20ea04319a85804f5070ede89c28f50d Mon Sep 17 00:00:00 2001
From: nri <nri@opencascade.com>
Date: Fri, 11 Jul 2003 07:28:42 +0000
Subject: [PATCH] NRI : Merge from V1_2.

---
 bin/VERSION                      |  2 +-
 doc/html/INPUT/doxyfile          |  4 ++--
 doc/html/Makefile.in             | 12 +++++++-----
 salome_adm/unix/make_commence.in |  2 +-
 src/Utils/Utils_Timer.hxx        |  3 +++
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/bin/VERSION b/bin/VERSION
index cdeb8b33b..b52f804d0 100755
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1 @@
-THIS IS SALOME PRO - KERNEL VERSION: 1.1a
+THIS IS SALOME PRO - KERNEL VERSION: 1.2
diff --git a/doc/html/INPUT/doxyfile b/doc/html/INPUT/doxyfile
index 1ea6feac7..7d216e70c 100755
--- a/doc/html/INPUT/doxyfile
+++ b/doc/html/INPUT/doxyfile
@@ -3,8 +3,8 @@
 #---------------------------------------------------------------------------
 # General configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME PRO v.1.1a"
-PROJECT_NUMBER         = id#1.0
+PROJECT_NAME           = "SALOME PRO v.1.2"
+PROJECT_NUMBER         = id#1.1
 OUTPUT_DIRECTORY       = ../
 OUTPUT_LANGUAGE        = English
 EXTRACT_ALL            = YES
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index 6b636a242..f7fe30037 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -1,10 +1,12 @@
-# -* Makefile *- 
+#  Copyright (C) 2003  CEA/DEN, EDF R&D
 #
-# Author : Vasily Rusyaev (Open Cascade NN)
-# Date : 13/02/2003
-# $Header: 
 #
-# source path
+#
+#  File   : Makefile.in
+#  Author : Vasily Rusyaev (Open Cascade NN)
+#  Module : doc
+#  $Header: 
+
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
diff --git a/salome_adm/unix/make_commence.in b/salome_adm/unix/make_commence.in
index c9dbea053..d5e8ecc61 100644
--- a/salome_adm/unix/make_commence.in
+++ b/salome_adm/unix/make_commence.in
@@ -194,7 +194,7 @@ idldir=${prefix}/idl/salome
 sharedpydir=@libdir@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
 incmakedir=${prefix}/salome_adm/unix
 
-docdir=@exec_prefix@/doc
+docdir=$(datadir)/doc
 
 #
 # begin of package rules
diff --git a/src/Utils/Utils_Timer.hxx b/src/Utils/Utils_Timer.hxx
index a35afb6ad..06e10671b 100644
--- a/src/Utils/Utils_Timer.hxx
+++ b/src/Utils/Utils_Timer.hxx
@@ -24,6 +24,9 @@
 //  File   : Utils_Timer.hxx
 //  Module : SALOME
 
+#include <stdlib.h>
+#include <time.h>
+
 # include <sys/times.h>
 # include <sys/time.h>
 # include <unistd.h>
-- 
2.39.2