configure.in | 11 7 + 4 - 0 !
src/defaults.h | 5 3 + 2 - 0 !
src/dictgui.cpp | 7 4 + 3 - 0 !
src/dictgui.h | 4 2 + 2 - 0 !
src/main.cpp | 80 70 + 10 - 0 !
src/properties.cpp | 39 33 + 6 - 0 !
src/properties.h | 6 5 + 1 - 0 !
src/translator.cpp | 22 22 + 0 - 0 !
src/translator_manager.cpp | 85 52 + 33 - 0 !
src/translator_manager.h | 12 7 + 5 - 0 !
10 files changed, 205 insertions(+), 66 deletions(-)

 add support to multiple dictionary directories
#  stolen from upstream multidir branch

COPYING | 2 1 + 1 - 0 !
COPYING.BULGARIAN | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

---

src/trayicon.h | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix methid declaration
#  GCC 4.1 brafs if it is fully qualified

src/language_tools.h | 82 41 + 41 - 0 !
1 file changed, 41 insertions(+), 41 deletions(-)

 declare inline strings as constants
#  Modern GCC (rightfully) complain otherwise

src/translator_manager.cpp | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 include the right header file
#  GCC 4.3 has stricter rules about inclusion propagation

src/translator.cpp | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 since a constant is passed into strchr(), pu must also be const
#              to keep the compiler from generating an error.
# Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gbgoffice/+bug/445624
# Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550115
#

src/dictgui.cpp | 2 1 + 1 - 0 !
src/dictgui.h | 4 2 + 2 - 0 !
src/workhelper.h | 2 1 + 1 - 0 !
3 files changed, 4 insertions(+), 4 deletions(-)

 fix compilation with gcc-4.5 (and corresponding libstdc++)
#  Some deprecated typedefs are finally removed
#  Constructors need not be explicitly named

Bug: #564991

src/workhelper.cpp | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix hba declaration to match get_action_area return type
#  Gtk::Dialog 2.18 now defines this as a generic ButtonBox

src/Makefile.am | 2 1 + 1 - 0 !
src/Makefile.in | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

 explicitly link against libx11
#  The binary uses its symbols and not linking explicitly causes
#  a failure to build with GNU binutils gold

src/translator_manager.cpp | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 fixes compilation with gcc-6
 return type must be Translator* and can't be boolean

src/exam.cpp | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

 do not crash when attempting test with no suitable dictionaries
 getTestDictionaryObject may return NULL