lp:~noskcaj/ubuntu/utopic/devhelp/merge

Makefile.am (+1/-1)
Makefile.in (+197/-184)
NEWS (+168/-0)
aclocal.m4 (+444/-341)
autogen.sh (+0/-1)
build-aux/compile (+7/-3)
build-aux/config.guess (+106/-78)
build-aux/config.sub (+57/-48)
build-aux/depcomp (+269/-186)
build-aux/install-sh (+7/-7)
build-aux/ltmain.sh (+2/-2)
build-aux/missing (+159/-275)
build-aux/py-compile (+16/-7)
config.h.in (+0/-34)
configure (+451/-2804)
configure.ac (+8/-33)
contrib/Makefile.in (+75/-62)
contrib/bulkman.pl (+1/-3)
data/Makefile.am (+13/-2)
data/Makefile.in (+189/-162)
data/devhelp.appdata.xml.in (+15/-0)
data/devhelp.desktop.in (+1/-1)
data/dtd/Makefile.in (+76/-63)
data/icons/Makefile.in (+78/-65)
data/libdevhelp-3.0.pc.in (+1/-1)
data/org.gnome.devhelp.gschema.xml (+5/-0)
debian/changelog (+38/-0)
debian/control (+7/-7)
debian/control.in (+6/-6)
debian/libdevhelp-3-2.symbols (+1/-0)
debian/rules (+0/-3)
libgd/Makefile.am (+0/-247)
libgd/Makefile.in (+0/-1142)
libgd/README (+0/-131)
libgd/libgd.m4 (+0/-151)
libgd/libgd/gd-header-bar.c (+0/-1350)
libgd/libgd/gd-header-bar.h (+0/-75)
libgd/libgd/gd-header-button.c (+0/-488)
libgd/libgd/gd-header-button.h (+0/-64)
libgd/libgd/gd.h (+0/-90)
libgd/test-header-bar.c (+0/-71)
libgd/test-revealer.c (+0/-33)
libgd/test-stack.c (+0/-177)
m4/gettext.m4 (+0/-381)
m4/iconv.m4 (+0/-180)
m4/intlmacosx.m4 (+0/-51)
m4/lib-ld.m4 (+0/-110)
m4/lib-link.m4 (+0/-709)
m4/lib-prefix.m4 (+0/-185)
m4/libtool.m4 (+9/-3)
m4/po.m4 (+0/-449)
m4/progtest.m4 (+0/-92)
misc/Makefile.in (+146/-152)
misc/devhelp.vim (+1/-3)
misc/gedit-plugin/Makefile.in (+93/-69)
misc/gedit-plugin/devhelp.py (+33/-41)
po/POTFILES.in (+5/-2)
po/as.po (+219/-187)
po/be.po (+104/-118)
po/ca.po (+140/-310)
po/ca@valencia.po (+130/-300)
po/cs.po (+171/-163)
po/da.po (+216/-188)
po/de.po (+169/-164)
po/el.po (+203/-171)
po/es.po (+211/-181)
po/eu.po (+416/-364)
po/fi.po (+223/-191)
po/fr.po (+216/-184)
po/gl.po (+195/-165)
po/he.po (+215/-187)
po/hu.po (+223/-189)
po/id.po (+235/-302)
po/it.po (+200/-195)
po/ja.po (+285/-290)
po/ko.po (+195/-240)
po/lt.po (+190/-187)
po/lv.po (+321/-300)
po/ml.po (+198/-209)
po/nb.po (+181/-183)
po/pl.po (+194/-185)
po/pt.po (+220/-187)
po/pt_BR.po (+193/-157)
po/ru.po (+201/-240)
po/sk.po (+196/-302)
po/sl.po (+215/-187)
po/sr.po (+196/-184)
po/sr@latin.po (+196/-184)
po/th.po (+132/-127)
po/uk.po (+346/-297)
po/zh_CN.po (+328/-303)
po/zh_HK.po (+192/-178)
po/zh_TW.po (+196/-178)
src/Makefile.am (+2/-8)
src/Makefile.in (+165/-123)
src/devhelp-menu.ui (+51/-0)
src/devhelp.h (+1/-3)
src/devhelp.ui (+0/-395)
src/dh-app.c (+168/-132)
src/dh-app.h (+3/-5)
src/dh-assistant-view.c (+0/-41)
src/dh-assistant-view.h (+0/-4)
src/dh-assistant.c (+61/-100)
src/dh-assistant.h (+1/-3)
src/dh-assistant.ui (+16/-0)
src/dh-book-manager.c (+55/-66)
src/dh-book-manager.h (+1/-3)
src/dh-book-tree.c (+128/-61)
src/dh-book-tree.h (+1/-3)
src/dh-book.c (+78/-63)
src/dh-book.h (+9/-11)
src/dh-common.c (+1/-3)
src/dh-error.c (+1/-3)
src/dh-error.h (+1/-3)
src/dh-keyword-model.c (+177/-109)
src/dh-keyword-model.h (+2/-5)
src/dh-language.c (+1/-3)
src/dh-language.h (+1/-3)
src/dh-link.c (+61/-58)
src/dh-link.h (+5/-7)
src/dh-main.c (+1/-3)
src/dh-parser.c (+7/-12)
src/dh-parser.h (+1/-3)
src/dh-preferences.c (+446/-474)
src/dh-preferences.h (+25/-4)
src/dh-preferences.ui (+345/-0)
src/dh-resources.c (+2460/-2250)
src/dh-settings.c (+1/-3)
src/dh-settings.h (+1/-3)
src/dh-sidebar.c (+316/-233)
src/dh-sidebar.h (+3/-7)
src/dh-util.c (+4/-14)
src/dh-util.h (+1/-7)
src/dh-window.c (+214/-415)
src/dh-window.h (+1/-5)
src/dh-window.ui (+297/-0)
src/dh.gresource.xml (+5/-2)
src/eggfindbar.c (+0/-755)
src/eggfindbar.h (+0/-81)
src/gedit-close-button.c (+82/-0)
src/gedit-close-button.h (+60/-0)