Merge branch 'gui'
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Wed, 4 Aug 2010 09:57:03 +0000 (11:57 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Wed, 4 Aug 2010 09:57:03 +0000 (11:57 +0200)
commite459b29699f86ddb1fce2acd899b8c84225037d6
treeff1b6b11a1cba87f5d7893a4d5c9de52288ef26e
parente7d0060f2f6b6cf69948261ac3f644f06cb5b556
parente276cb11bf7211649666708859c3660ba3e174db
Merge branch 'gui'

Conflicts:
trunk/src/base/mDictionary.pro.user