Mercurial Mercurial > oss > FCL > sf > mw > qtextensions / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qtmobility/dist/changes-1.0.0-beta1
changeset 8 71781823f776
parent 4 90517678cc4f
child 14 6fbed849b4f4 
--- a/qtmobility/dist/changes-1.0.0-beta1	Fri May 14 16:41:33 2010 +0300
+++ b/qtmobility/dist/changes-1.0.0-beta1	Thu May 27 13:42:11 2010 +0300
@@ -385,11 +385,6 @@
 
  -
 
-<<<<<<< HEAD:dist/changes-1.0.0-beta1
-Qt Mobility for Symbian
-------
-
-=======
 Qt Mobility for Maemo5
 ------
FCL/sf/mw/qtextensions