Merge change in interfaces files
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Tue, 3 Aug 2010 08:16:20 +0000 (10:16 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Tue, 3 Aug 2010 08:16:20 +0000 (10:16 +0200)
commite657bcf73ef378aefd28956229c29f9bcacdb135
tree1755a7a12be0b8b6169a47a0ef3089017d33287b
parent9d9d48b609cafb761bf1af8ddc155b79bee2398d
parent41cac7ed9897f1a55c5dc9fb271021f07a8449be
Merge change in interfaces files

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