Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml
authorjakub <jakub.jaszczynski@comarch.com>
Fri, 25 Feb 2011 08:39:59 +0000 (09:39 +0100)
committerjakub <jakub.jaszczynski@comarch.com>
Fri, 25 Feb 2011 08:39:59 +0000 (09:39 +0100)
commit9427983f428542e40d737a9f7f719809c229a83d
tree18bf85fef6bb63b422b73e04c77eda7ef9af60e6
parentb598b5429912126f850c9990e60af8cdee8649ee
parent21a14d392f44458d749c76552e971f33625705ea
Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml

Conflicts:
www/devhowto.html
www/images/Meego.png
www/images/qml/w07.png
www/qmlelements.html
www/devhowto.html
www/qmlelements.html