summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdullah Sowayan <sowayan@users.noreply.github.com>2007-09-11 17:26:00 +0000
committerAbdullah Sowayan <sowayan@users.noreply.github.com>2007-09-11 17:26:00 +0000
commita51ff744b6c39bd849124345907d4785da103d14 (patch)
treef359a7ffc0dfc448aceffb092c9cfedbf5185683
parent08febf5f9957301a24ef0655b8f5dfc4c7aa3826 (diff)
downloadATCD-a51ff744b6c39bd849124345907d4785da103d14.tar.gz
Tue Sep 11 17:25:01 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
-rw-r--r--ACE/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index a9767fc4554..806b04f9e97 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -172,7 +172,6 @@ Mon Sep 03 02:50:30 CDT 2007 Johnny Willemsen <jwillemsen@remedy.nl>
* ACE version 5.6 released.
->>>>>>> .r79627
Thu Aug 30 17:23:21 UTC 2007 Steve Huston <shuston@riverace.com>
* bin/LabVIEW_RT/labview_test_controller/stdafx.cpp: