Merge branch 'master' into cache
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Thu, 19 Aug 2010 10:51:54 +0000 (12:51 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Thu, 19 Aug 2010 10:51:54 +0000 (12:51 +0200)
commitc7b31734e295f28237a8ed7a99670282da91557c
tree9cc2bfffe5065828dff9be3132000d010231ae96
parentceb0ccfad1a495873bd738a46529391536b14212
parent1f332b333bc0fbacfa555cda7eae2a8f5c7d09fc
Merge branch 'master' into cache

Conflicts:
trunk/src/base/gui/TranslationWidget.cpp
trunk/src/base/gui/TranslationWidget.h
trunk/src/base/base.pro
trunk/src/base/gui/TranslationWidget.cpp
trunk/src/base/gui/TranslationWidget.h