summaryrefslogtreecommitdiffstats
path: root/trunk/ChangeLog.cross
diff options
context:
space:
mode:
Diffstat (limited to 'trunk/ChangeLog.cross')
-rw-r--r--trunk/ChangeLog.cross4
1 files changed, 4 insertions, 0 deletions
diff --git a/trunk/ChangeLog.cross b/trunk/ChangeLog.cross
index 3424127..a607b65 100644
--- a/trunk/ChangeLog.cross
+++ b/trunk/ChangeLog.cross
@@ -1,3 +1,7 @@
+2010-07-22 Mark Hatle <mark.hatle@windriver.com>
+ * Merge to upstream r185
+ * Resync dso-readonly.c from dso.c
+
2010-06-18 Mark Hatle <mark.hatle@windriver.com>
* Sync src/dso-readonly.c and ...