Merge branch 'master' into xdxf
authorPiotrek <ppilar11@gmail.com>
Wed, 4 Aug 2010 10:25:15 +0000 (12:25 +0200)
committerPiotrek <ppilar11@gmail.com>
Wed, 4 Aug 2010 10:25:15 +0000 (12:25 +0200)
commit314b32c97cc8fbfd650c442dd3105ea6cff22abf
tree79961bf1d410bd5f8153226522fe6d4cad74e955
parentea57857e6d981239124295a4511a6d01d36ecf18
parentcdd29888c9d65e469deb8747c836bb75e875bde3
Merge branch 'master' into xdxf

Conflicts:
trunk/src/includes/CommonDictInterface.h
trunk/src/includes/settings.h
trunk/src/includes/translation.h
trunk/src/includes/CommonDictInterface.h
trunk/src/includes/settings.h
trunk/src/includes/translation.h