Merge branch 'xdxf', remote branch 'origin'
-rw-r--r-- 53 .gitignore
drwxr-xr-x - data
drwxr-xr-x - debian
drwxr-xr-x - doc
-rw-r--r-- 221 mdictionary.pro
drwxr-xr-x - trunk