From d5cfbda7a374db1ad028ac920adbe33a6da3f131 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue, 7 Nov 2006 12:45:05 +0000
Subject: Tue Nov  7 12:44:12 UTC 2006  Johnny Willemsen 
 <jwillemsen@remedy.nl>

---
 TAO/ChangeLog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 3bd4d5086fa..6f57f676e1e 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Tue Nov  7 12:44:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Two_Objects/worker.{h,cpp}:
+        * tests/Two_Objects/server.cpp:
+          Renamed timeout to orb_timeout, resolves the warnings in the
+          rtems build where timeout is also something in the rtems
+          glue code.
+
 Tue Nov  7 09:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
-- 
cgit v1.2.1