Merge lp://staging/~noskcaj/ubuntu/utopic/gtk-doc/1.21 into lp://staging/ubuntu/utopic/gtk-doc
Proposed by
Jackson Doak
Status: | Merged |
---|---|
Merged at revision: | 32 |
Proposed branch: | lp://staging/~noskcaj/ubuntu/utopic/gtk-doc/1.21 |
Merge into: | lp://staging/ubuntu/utopic/gtk-doc |
Diff against target: |
24822 lines (+5101/-6336) 45 files modified
Makefile.am (+7/-2) Makefile.in (+15/-11) NEWS (+39/-0) TODO (+18/-59) configure (+13/-17) configure.ac (+6/-5) debian/changelog (+18/-0) debian/control (+2/-2) debian/control.in (+1/-1) gtk-doc.spec (+1/-1) gtk-doc.xsl (+13/-13) gtkdoc-fixxref.in (+10/-18) gtkdoc-mkdb.in (+145/-165) gtkdoc-scan.in (+9/-6) gtkdoc-scanobj.in (+0/-580) help/manual/C/index.docbook (+105/-213) help/manual/Makefile.am (+4/-2) help/manual/Makefile.in (+4/-2) help/manual/bn_IN/index.docbook (+113/-198) help/manual/de/index.docbook (+166/-219) help/manual/el/el.po (+926/-824) help/manual/el/fdl-appendix.xml (+1/-1) help/manual/el/index.docbook (+213/-370) help/manual/en_GB/index.docbook (+108/-184) help/manual/es/es.po (+1024/-690) help/manual/es/index.docbook (+56/-168) help/manual/fr/fr.po (+1/-1) help/manual/fr/index.docbook (+167/-226) help/manual/gu/index.docbook (+113/-183) help/manual/pt_BR/index.docbook (+105/-274) help/manual/pt_BR/pt_BR.po (+775/-681) help/manual/sl/index.docbook (+109/-217) help/manual/sv/index.docbook (+109/-217) help/manual/ta/index.docbook (+107/-191) help/manual/te/index.docbook (+108/-178) help/manual/zh_CN/index.docbook (+180/-256) style/style.css (+153/-138) tests/annotations/docs/tester-sections.txt (+5/-0) tests/annotations/src/tester.c (+77/-1) tests/annotations/src/tester.h (+22/-16) tests/bugs/docs/tester-sections.txt (+3/-0) tests/bugs/src/tester.c (+1/-1) tests/bugs/src/tester.h (+34/-5) tests/gobject/docs/tester-sections.txt (+2/-0) tests/gobject/src/gobject.h (+13/-0) |
To merge this branch: | bzr merge lp://staging/~noskcaj/ubuntu/utopic/gtk-doc/1.21 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+229347@code.staging.launchpad.net |
Description of the change
Merge from debian
To post a comment you must log in.