summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/DevGuideExamples/ChangeLog8
-rw-r--r--TAO/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc (renamed from TAO/DevGuideExamples/NotifyService/Messenger/Messenger.mpc)0
2 files changed, 8 insertions, 0 deletions
diff --git a/TAO/DevGuideExamples/ChangeLog b/TAO/DevGuideExamples/ChangeLog
index ccc1d05668b..e5321de638e 100644
--- a/TAO/DevGuideExamples/ChangeLog
+++ b/TAO/DevGuideExamples/ChangeLog
@@ -1,3 +1,11 @@
+Wed Oct 22 15:25:00 UTC 2008 Simon Massey <sma at prismtech dot com>
+
+ * NotifyService/Messenger/Messenger.mpc:
+
+ Renamed to avoid name clash.
+
+ * NotifyService/Messenger/NotifyService_Messenger.mpc:
+
Wed Oct 22 15:05:00 UTC 2008 Simon Massey <sma at prismtech dot com>
* Multithreading/ThreadPerConnection/ThreadPerConnection.mpc:
diff --git a/TAO/DevGuideExamples/NotifyService/Messenger/Messenger.mpc b/TAO/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc
index c6cd2f3d24c..c6cd2f3d24c 100644
--- a/TAO/DevGuideExamples/NotifyService/Messenger/Messenger.mpc
+++ b/TAO/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc