Merge authors: Dmitrijs Ledkovs (dmitrij.ledkov) ------------------------------------------------------------ revno: 78 [merge] committer: Dmitrijs Ledkovs <[email protected]> branch nick: trunk timestamp: Sun 2010-11-14 00:38:52 +0000 message: New upstream release 3.1.4 removed: ABOUT-NLS Makefile.am Makefile.in aclocal.m4 compile config.guess config.h.in config.sub configure.in depcomp doc/Makefile.am doc/Makefile.in gnome-doc-utils.make help/C/figures/preferences_general-tabs.png help/C/figures/preferences_modules-main.png help/Makefile.am help/Makefile.in help/fa/interface.xml help/fa/introduction.xml help/fa/journals.xml help/fa/modules.xml help/fa/onlinehelp.xml help/fa/originallanguage.xml help/fa/personal.xml help/fa/preferences.xml help/fa/search.xml help/fa/start.xml help/fa/studypad.xml help/fa/xiphos.xml help/fr/figures/preferences_general-tabs.png help/fr/figures/preferences_modules-main.png help/fr/interface.xml help/fr/introduction.xml help/fr/journals.xml help/fr/modules.xml help/fr/onlinehelp.xml help/fr/originallanguage.xml help/fr/personal.xml help/fr/preferences.xml help/fr/search.xml help/fr/start.xml help/fr/studypad.xml help/fr/xiphos.xml install-sh ltmain.sh missing mkinstalldirs omf.make pixmaps/Makefile.am pixmaps/Makefile.in po/Makefile.in.in src/Makefile.am src/Makefile.in src/backend/Makefile.am src/backend/Makefile.in src/editor/Makefile.am src/editor/Makefile.in src/examples/Makefile src/gecko/Makefile.am src/gecko/Makefile.in src/gnome2/Makefile.am src/gnome2/Makefile.in src/gnome2/marshal.c src/gui/shortcutbar_dialog.h src/gui/shortcutbar_main.h src/gui/shortcutbar_search.h src/gui/shortcutbar_viewer.h src/main/Makefile.am src/main/Makefile.in ui/Makefile.am ui/Makefile.in xiphos.spec.in xmldocs.make added: .bzrrules doc/c.txt doc/function.txt doc/getting_started.txt doc/h.txt editkit/ editkit/editkit.vala editkit/main.ui editkit/wscript help/C/figures/index_all_pngs.py help/C/figures/module-overview.png help/Changelog help/Guidelines help/fa/figures/TODO help/fa/figures/biblepane-options.png help/fr/figures/module-overview.png help/translating/ help/translating/installer.xml help/translating/introduction.xml help/translating/manual.xml help/translating/translation.xml help/translating/website.xml help/translating/xiphospo.xml help/translating/xiphossvn.xml help/xiphos.pdf help/xiphos.pot m4/ m4/nls.m4 pixmaps/xiphos-button-125.png po/Guidelines po/af.po po/ar.po po/bg.po po/it.po po/ja.po po/tr.po po/uk.po po/update.sh po/xiphos.pot po/zh_CN.po src/examples/wscript_build src/examples/xiphos-nav.c src/geckowin/ src/geckowin/BrowserEmbed.cpp src/geckowin/BrowserEmbed.h src/geckowin/EmbedEventListener.cpp src/geckowin/EmbedEventListener.h src/geckowin/FixFocus.cpp src/geckowin/FixFocus.h src/geckowin/Init.cpp src/geckowin/Init.h src/geckowin/WindowCreator.cpp src/geckowin/WindowCreator.h src/geckowin/gecko-html.cpp src/geckowin/gecko-html.h src/geckowin/signals.h src/geckowin/wscript_build stamp-h.in waffles/hashing.py waffles/nothreads.py xiphos.1 xiphos.doap.rdf modified: ChangeLog INSTALL NEWS RELEASE-NOTES configure debian/changelog help/C/figures/first_start.png help/C/figures/interface.png help/C/figures/interface_biblepane-options.png help/C/figures/interface_biblepane.png help/C/figures/interface_commentarypane.png help/C/figures/interface_dictionary.png help/C/figures/interface_menubar-view.png help/C/figures/interface_menubar.png help/C/figures/interface_parallel-separate.png help/C/figures/interface_parallel.png help/C/figures/interface_searchpane.png help/C/figures/interface_shortcut.png help/C/figures/interface_sidepane.png help/C/figures/interface_toolbar.png help/C/figures/interface_viewer.png help/C/figures/journal.png help/C/figures/module.png help/C/figures/personal.png help/C/figures/preferences.png help/C/figures/preferences_fonts-color.png help/C/figures/preferences_fonts-misc.png help/C/figures/preferences_general-misc.png help/C/figures/preferences_modules-misc.png help/C/figures/preferences_modules-parallel.png help/C/figures/search_search.png help/C/figures/studypad.png help/C/figures/sword_config.png help/C/figures/sword_install.png help/C/figures/sword_remove.png help/C/figures/sword_sources.png help/C/interface.xml help/C/introduction.xml help/C/journals.xml help/C/modules.xml help/C/personal.xml help/C/preferences.xml help/C/search.xml help/C/start.xml help/C/studypad.xml help/C/xiphos.xml help/fr/figures/first_start.png help/fr/figures/interface.png help/fr/figures/interface_biblepane-options.png help/fr/figures/interface_biblepane.png help/fr/figures/interface_dictionary.png help/fr/figures/interface_menubar-view.png help/fr/figures/interface_menubar.png help/fr/figures/interface_parallel-separate.png help/fr/figures/interface_parallel.png help/fr/figures/interface_searchpane.png help/fr/figures/interface_sidepane.png help/fr/figures/interface_toolbar.png help/fr/figures/interface_viewer.png help/fr/figures/journal.png help/fr/figures/module.png help/fr/figures/personal.png help/fr/figures/preferences.png help/fr/figures/preferences_fonts-color.png help/fr/figures/preferences_fonts-misc.png help/fr/figures/preferences_general-misc.png help/fr/figures/preferences_modules-misc.png help/fr/figures/preferences_modules-parallel.png help/fr/figures/search_search.png help/fr/figures/studypad.png help/fr/figures/sword_config.png help/fr/figures/sword_install.png help/fr/figures/sword_remove.png help/fr/figures/sword_sources.png help/fr/fr.po help/wscript_build po/LINGUAS po/cs.po po/cy.po po/da.po po/de.po po/en_GB.po po/es.po po/fa.po po/fi.po po/fr.po po/he.po po/hu.po po/lv.po po/nb.po po/nl.po po/pl.po po/pt.po po/pt_BR.po po/ro.po po/ru.po po/sk.po po/sl.po po/sv.po po/zh_TW.po src/backend/gs_stringmgr.cpp src/backend/module_manager.cc src/backend/module_manager.hh src/backend/sword_main.cc src/backend/sword_main.hh src/editor/link_dialog.c src/editor/link_dialog.h src/editor/slib-editor.c src/editor/slib-editor.h src/gecko/Yelper.cpp src/gecko/Yelper.h src/gecko/gecko-html.cpp src/gecko/gecko-html.h src/gecko/gecko-print.c src/gecko/gecko-print.h src/gecko/gecko-services.cpp src/gecko/gecko-services.h src/gecko/gecko-utils.cpp src/gnome2/about_modules.c src/gnome2/about_sword.c src/gnome2/about_trans.c src/gnome2/about_xiphos.c src/gnome2/bibletext.c src/gnome2/bibletext_dialog.c src/gnome2/bookmark_dialog.c src/gnome2/bookmarks_menu.c src/gnome2/bookmarks_treeview.c src/gnome2/cipher_key_dialog.c src/gnome2/commentary.c src/gnome2/commentary_dialog.c src/gnome2/dialog.c src/gnome2/dictlex.c src/gnome2/dictlex_dialog.c src/gnome2/display_info.c src/gnome2/dummy.cpp src/gnome2/export_bookmarks.c src/gnome2/export_dialog.c src/gnome2/find_dialog.c src/gnome2/font_dialog.c src/gnome2/gbs.c src/gnome2/gbs_dialog.c src/gnome2/gui.c src/gnome2/html.c src/gnome2/ipc.c src/gnome2/main_menu.c src/gnome2/main_window.c src/gnome2/menu_popup.c src/gnome2/mod_mgr.c src/gnome2/navbar_book.c src/gnome2/navbar_book_dialog.c src/gnome2/navbar_versekey.c src/gnome2/navbar_versekey_dialog.c src/gnome2/navbar_versekey_editor.c src/gnome2/navbar_versekey_parallel.c src/gnome2/parallel_dialog.c src/gnome2/parallel_tab.c src/gnome2/parallel_view.c src/gnome2/preferences_dialog.c src/gnome2/search_dialog.c src/gnome2/search_sidebar.c src/gnome2/sidebar.c src/gnome2/sidebar_dialog.c src/gnome2/splash.c src/gnome2/tabbed_browser.c src/gnome2/treekey-editor.c src/gnome2/utilities.c src/gnome2/xiphos.c src/gui/about_modules.h src/gui/about_sword.h src/gui/about_trans.h src/gui/about_xiphos.h src/gui/bibletext.h src/gui/bibletext_dialog.h src/gui/bookmark_dialog.h src/gui/bookmarks.h src/gui/bookmarks_menu.h src/gui/bookmarks_treeview.h src/gui/cipher_key_dialog.h src/gui/commentary.h src/gui/commentary_dialog.h src/gui/debug_glib_null.h src/gui/dialog.h src/gui/dictlex.h src/gui/dictlex_dialog.h src/gui/display_info.h src/gui/export_bookmarks.h src/gui/export_dialog.h src/gui/find_dialog.h src/gui/font_dialog.h src/gui/gbs.h src/gui/gbs_dialog.h src/gui/html.h src/gui/ipc.h src/gui/main_menu.h src/gui/main_window.h src/gui/menu_popup.h src/gui/mod_mgr.h src/gui/navbar_book.h src/gui/navbar_book_dialog.h src/gui/navbar_versekey.h src/gui/navbar_versekey_dialog.h src/gui/navbar_versekey_editor.h src/gui/navbar_versekey_parallel.h src/gui/parallel_dialog.h src/gui/parallel_tab.h src/gui/parallel_view.h src/gui/preferences_dialog.h src/gui/search_dialog.h src/gui/search_sidebar.h src/gui/sidebar.h src/gui/sidebar_dialog.h src/gui/tabbed_browser.h src/gui/treekey-editor.h src/gui/utilities.h src/gui/widgets.h src/gui/xiphos.h src/main/configs.cc src/main/configs.h src/main/display.cc src/main/display.hh src/main/export_passage.cc src/main/export_passage.h src/main/global_ops.cc src/main/global_ops.hh src/main/lists.cc src/main/lists.h src/main/main.c src/main/mod_mgr.cc src/main/mod_mgr.h src/main/module_dialogs.cc src/main/module_dialogs.h src/main/modulecache.cc src/main/modulecache.hh src/main/navbar.cc src/main/navbar.h src/main/navbar_book.cc src/main/navbar_book.h src/main/navbar_book_dialog.cc src/main/navbar_book_dialog.h src/main/navbar_versekey.cc src/main/navbar_versekey.h src/main/parallel_view.cc src/main/parallel_view.h src/main/prayerlists.cc src/main/prayerlists.h src/main/previewer.cc src/main/previewer.h src/main/search_dialog.cc src/main/search_dialog.h src/main/search_sidebar.cc src/main/search_sidebar.h src/main/settings.c src/main/settings.h src/main/sidebar.cc src/main/sidebar.h src/main/sword.cc src/main/sword.h src/main/sword_treekey.cc src/main/sword_treekey.h src/main/tab_history.c src/main/tab_history.h src/main/url.cc src/main/url.hh src/main/xml.c src/main/xml.h ui/module-manager.glade ui/navbar_versekey.glade ui/prefs.glade ui/search-dialog.glade ui/xi-menus.glade waf waffles/cross_linux_win32.py waffles/documentation.py wscript xiphos.desktop.in.in xiphos.spec The size of the diff (235089 lines) is larger than your specified limit of 500 lines
-- lp:xiphos/debian https://code.launchpad.net/~pkgcrosswire/xiphos/main Your team Crosswire Packaging Team is subscribed to branch lp:xiphos/debian. To unsubscribe from this branch go to https://code.launchpad.net/~pkgcrosswire/xiphos/main/+edit-subscription _______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-crosswire-devel
