Author: kihamala
Date: 2009-10-07 09:19:18 +0300 (Wed, 07 Oct 2009)
New Revision: 19417
Modified:
projects/haf/trunk/libmatchbox2/ChangeLog
Log:
remove ">>>>>>> .r19412"
Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog 2009-10-06 06:03:11 UTC (rev
19416)
+++ projects/haf/trunk/libmatchbox2/ChangeLog 2009-10-07 06:19:18 UTC (rev
19417)
@@ -12,7 +12,6 @@
Release 0.2.71
->>>>>>> .r19412
2009-09-30 Adam Endrodi <adam.endr...@blumsoft.eu>
* matchbox/core/mb-wm-client-window.c
_______________________________________________
maemo-commits mailing list
maemo-commits@maemo.org
https://lists.maemo.org/mailman/listinfo/maemo-commits
