Merge branch 'cache'
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Fri, 20 Aug 2010 10:20:58 +0000 (12:20 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Fri, 20 Aug 2010 10:20:58 +0000 (12:20 +0200)
Conflicts:
trunk/src/base/gui/TranslationWidget.cpp

1  2 
trunk/src/base/gui/TranslationWidget.cpp