Merge authors: Dmitrijs Ledkovs (dmitrij.ledkov) ------------------------------------------------------------ revno: 88 [merge] committer: Dmitrijs Ledkovs <[email protected]> branch nick: xiphos timestamp: Wed 2012-02-22 23:40:53 +0000 message: New upstream release. removed: po/af.po po/it.po po/update.sh stamp-h.in added: help/fa/figures/interface_biblepane-options.png help/fa/figures/search_search.png src/examples/marshal.list src/main/cpp-errors.txt src/main/gtk_compat.h src/webkit/ src/webkit/marshal.list src/webkit/wk-html.c src/webkit/wk-html.h src/webkit/wscript_build src/xiphos_html/ src/xiphos_html/marshal.list src/xiphos_html/wscript_build src/xiphos_html/xiphos_html.c src/xiphos_html/xiphos_html.h tests/ tests/build.py ui/bookmarks.gtkbuilder ui/export-dialog.gtkbuilder ui/gnome-session.png ui/gnome-windows.png ui/gs2-48x48-old.png ui/markverse.gtkbuilder ui/module-manager.gtkbuilder ui/navbar_versekey.gtkbuilder ui/prefs.gtkbuilder ui/search-dialog.gtkbuilder ui/sword.png ui/xi-menus-popup.gtkbuilder ui/xi-menus.gtkbuilder ui/xi-splash.ui wafadmin/ wafadmin/3rdparty/ wafadmin/3rdparty/boost.py wafadmin/3rdparty/fluid.py wafadmin/Build.py wafadmin/Configure.py wafadmin/Constants.py wafadmin/Environment.py wafadmin/Logs.py wafadmin/Node.py wafadmin/Options.py wafadmin/Runner.py wafadmin/Scripting.py wafadmin/Task.py wafadmin/TaskGen.py wafadmin/Tools/ wafadmin/Tools/__init__.py wafadmin/Tools/ar.py wafadmin/Tools/bison.py wafadmin/Tools/cc.py wafadmin/Tools/ccroot.py wafadmin/Tools/compiler_cc.py wafadmin/Tools/compiler_cxx.py wafadmin/Tools/compiler_d.py wafadmin/Tools/config_c.py wafadmin/Tools/cs.py wafadmin/Tools/cxx.py wafadmin/Tools/d.py wafadmin/Tools/dbus.py wafadmin/Tools/dmd.py wafadmin/Tools/flex.py wafadmin/Tools/gas.py wafadmin/Tools/gcc.py wafadmin/Tools/gdc.py wafadmin/Tools/glib2.py wafadmin/Tools/gnome.py wafadmin/Tools/gnu_dirs.py wafadmin/Tools/gob2.py wafadmin/Tools/gxx.py wafadmin/Tools/icc.py wafadmin/Tools/icpc.py wafadmin/Tools/intltool.py wafadmin/Tools/javaw.py wafadmin/Tools/kde4.py wafadmin/Tools/libtool.py wafadmin/Tools/lua.py wafadmin/Tools/misc.py wafadmin/Tools/msvc.py wafadmin/Tools/nasm.py wafadmin/Tools/ocaml.py wafadmin/Tools/osx.py wafadmin/Tools/perl.py wafadmin/Tools/preproc.py wafadmin/Tools/python.py wafadmin/Tools/qt4.py wafadmin/Tools/ruby.py wafadmin/Tools/suncc.py wafadmin/Tools/suncxx.py wafadmin/Tools/tex.py wafadmin/Tools/unittestw.py wafadmin/Tools/vala.py wafadmin/Tools/winres.py wafadmin/Tools/xlc.py wafadmin/Tools/xlcxx.py wafadmin/Utils.py wafadmin/__init__.py wafadmin/ansiterm.py wafadmin/pproc.py wafadmin/py3kfixes.py modified: AUTHORS ChangeLog NEWS RELEASE-NOTES TODO configure debian/changelog editkit/editkit.vala help/C/interface.xml help/C/xiphos.xml help/fr/fr.po help/wscript_build po/ar.po po/bg.po 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/ja.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/tr.po po/uk.po po/xiphos.pot po/zh_CN.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/examples/xiphos-nav.c src/gecko/Yelper.cpp src/gecko/gecko-html.cpp src/gecko/gecko-html.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/wscript_build 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/splash.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/export-dialog.glade ui/languages ui/module-manager.glade ui/prefs.glade ui/wscript_build ui/xi-menus.glade waf waffles/cross_linux_win32.py waffles/dbus.py waffles/gnome.py wscript xiphos.spec The size of the diff (138787 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/cgi-bin/mailman/listinfo/pkg-crosswire-devel
