r15023 - gnucash/branches/swig-redo - Rebase the swig-redo branch on trunk at r15000.

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

r15023 - gnucash/branches/swig-redo - Rebase the swig-redo branch on trunk at r15000.

Chris Shoemaker-2
Author: chris
Date: 2006-10-15 00:08:48 -0400 (Sun, 15 Oct 2006)
New Revision: 15023
Trac: http://svn.gnucash.org/trac/changeset/15023

Added:
   gnucash/branches/swig-redo/art/
   gnucash/branches/swig-redo/macros/binreloc.m4
   gnucash/branches/swig-redo/packaging/win32/
   gnucash/branches/swig-redo/src/engine/binreloc.c
   gnucash/branches/swig-redo/src/engine/binreloc.h
   gnucash/branches/swig-redo/src/engine/gnc-path.c
   gnucash/branches/swig-redo/src/engine/gnc-path.h
   gnucash/branches/swig-redo/src/gnome/gnucash.desktop.in.in
   gnucash/branches/swig-redo/src/import-export/hbci/gnc-file-aqb-import.c
   gnucash/branches/swig-redo/src/import-export/hbci/gnc-file-aqb-import.h
Removed:
   gnucash/branches/swig-redo/src/bin/i18n.h.in
   gnucash/branches/swig-redo/src/gnome-utils/gnc-dir.h.in
   gnucash/branches/swig-redo/src/gnome/gnucash.desktop.in
   gnucash/branches/swig-redo/src/import-export/mt940/Makefile.am
   gnucash/branches/swig-redo/src/import-export/mt940/gnc-mt940-import.c
   gnucash/branches/swig-redo/src/import-export/mt940/gnc-mt940-import.h
   gnucash/branches/swig-redo/src/import-export/mt940/gnc-plugin-mt940-ui.xml
   gnucash/branches/swig-redo/src/import-export/mt940/gnc-plugin-mt940.c
   gnucash/branches/swig-redo/src/import-export/mt940/gnc-plugin-mt940.h
   gnucash/branches/swig-redo/src/import-export/mt940/gncmod-mt940-import.c
Modified:
   gnucash/branches/swig-redo/ChangeLog
   gnucash/branches/swig-redo/Makefile.am
   gnucash/branches/swig-redo/configure.in
   gnucash/branches/swig-redo/doc/tip_of_the_day.list.in
   gnucash/branches/swig-redo/lib/guile-www/Makefile.am
   gnucash/branches/swig-redo/lib/libqof/backend/file/Makefile.am
   gnucash/branches/swig-redo/lib/libqof/backend/file/qsf-backend.c
   gnucash/branches/swig-redo/lib/libqof/backend/file/qsf-xml-map.c
   gnucash/branches/swig-redo/lib/libqof/qof/Makefile.am
   gnucash/branches/swig-redo/lib/libqof/qof/qof.h
   gnucash/branches/swig-redo/lib/libqof/qof/qofbackend-p.h
   gnucash/branches/swig-redo/lib/libqof/qof/qofbackend.h
   gnucash/branches/swig-redo/lib/libqof/qof/qofbook.c
   gnucash/branches/swig-redo/lib/libqof/qof/qofbook.h
   gnucash/branches/swig-redo/lib/libqof/qof/qofbookmerge.c
   gnucash/branches/swig-redo/lib/libqof/qof/qofchoice.c
   gnucash/branches/swig-redo/lib/libqof/qof/qofchoice.h
   gnucash/branches/swig-redo/lib/libqof/qof/qofclass.h
   gnucash/branches/swig-redo/lib/libqof/qof/qofid-p.h
   gnucash/branches/swig-redo/lib/libqof/qof/qofid.c
   gnucash/branches/swig-redo/lib/libqof/qof/qofid.h
   gnucash/branches/swig-redo/lib/libqof/qof/qofinstance.c
   gnucash/branches/swig-redo/lib/libqof/qof/qofinstance.h
   gnucash/branches/swig-redo/lib/libqof/qof/qofobject-p.h
   gnucash/branches/swig-redo/lib/libqof/qof/qofobject.c
   gnucash/branches/swig-redo/lib/libqof/qof/qofobject.h
   gnucash/branches/swig-redo/lib/libqof/qof/qofquery.c
   gnucash/branches/swig-redo/lib/libqof/qof/qofquery.h
   gnucash/branches/swig-redo/lib/libqof/qof/qofquerycore-p.h
   gnucash/branches/swig-redo/lib/libqof/qof/qofquerycore.c
   gnucash/branches/swig-redo/lib/libqof/qof/qofquerycore.h
   gnucash/branches/swig-redo/lib/libqof/qof/qofsession.c
   gnucash/branches/swig-redo/lib/libqof/qof/qofutil.h
   gnucash/branches/swig-redo/macros/legacy_macros.m4
   gnucash/branches/swig-redo/packaging/gnucash.spec.in
   gnucash/branches/swig-redo/po/POTFILES.skip
   gnucash/branches/swig-redo/src/app-utils/Makefile.am
   gnucash/branches/swig-redo/src/app-utils/gnc-account-merge.c
   gnucash/branches/swig-redo/src/app-utils/gnc-ui-util.c
   gnucash/branches/swig-redo/src/app-utils/test/Makefile.am
   gnucash/branches/swig-redo/src/app-utils/test/test-print-parse-amount.c
   gnucash/branches/swig-redo/src/app-utils/test/test-print-queries.c
   gnucash/branches/swig-redo/src/app-utils/test/test-scm-query-string.c
   gnucash/branches/swig-redo/src/backend/file/gnc-account-xml-v2.c
   gnucash/branches/swig-redo/src/backend/file/gnc-backend-file.c
   gnucash/branches/swig-redo/src/backend/file/gnc-commodity-xml-v2.c
   gnucash/branches/swig-redo/src/backend/file/test/Makefile.am
   gnucash/branches/swig-redo/src/backend/file/test/test-load-backend.c
   gnucash/branches/swig-redo/src/backend/file/test/test-load-example-account.c
   gnucash/branches/swig-redo/src/backend/file/test/test-load-xml2.c
   gnucash/branches/swig-redo/src/backend/file/test/test-save-in-lang.c
   gnucash/branches/swig-redo/src/backend/file/test/test-xml2-is-file.c
   gnucash/branches/swig-redo/src/backend/postgres/putil.c
   gnucash/branches/swig-redo/src/backend/postgres/test/test-db.c
   gnucash/branches/swig-redo/src/backend/postgres/test/test-load-backend.c
   gnucash/branches/swig-redo/src/backend/postgres/test/test-period.c
   gnucash/branches/swig-redo/src/bin/Makefile.am
   gnucash/branches/swig-redo/src/bin/gnucash-bin.c
   gnucash/branches/swig-redo/src/bin/gnucash.in
   gnucash/branches/swig-redo/src/bin/overrides/Makefile.am
   gnucash/branches/swig-redo/src/bin/test/Makefile.am
   gnucash/branches/swig-redo/src/business/business-core/Makefile.am
   gnucash/branches/swig-redo/src/business/business-core/file/gncmod-business-backend-file.c
   gnucash/branches/swig-redo/src/business/business-core/test/Makefile.am
   gnucash/branches/swig-redo/src/business/business-core/test/test-address.c
   gnucash/branches/swig-redo/src/business/business-core/test/test-business.c
   gnucash/branches/swig-redo/src/business/business-core/test/test-customer.c
   gnucash/branches/swig-redo/src/business/business-core/test/test-employee.c
   gnucash/branches/swig-redo/src/business/business-core/test/test-job.c
   gnucash/branches/swig-redo/src/business/business-core/test/test-vendor.c
   gnucash/branches/swig-redo/src/business/business-gnome/Makefile.am
   gnucash/branches/swig-redo/src/business/business-gnome/schemas/Makefile.am
   gnucash/branches/swig-redo/src/business/business-reports/Makefile.am
   gnucash/branches/swig-redo/src/business/business-utils/Makefile.am
   gnucash/branches/swig-redo/src/business/dialog-tax-table/Makefile.am
   gnucash/branches/swig-redo/src/calculation/expression_parser.c
   gnucash/branches/swig-redo/src/core-utils/Makefile.am
   gnucash/branches/swig-redo/src/core-utils/gnc-gconf-utils.c
   gnucash/branches/swig-redo/src/core-utils/gnc-gconf-utils.h
   gnucash/branches/swig-redo/src/core-utils/gnc-glib-utils.c
   gnucash/branches/swig-redo/src/core-utils/gnc-glib-utils.h
   gnucash/branches/swig-redo/src/engine/Account.c
   gnucash/branches/swig-redo/src/engine/Account.h
   gnucash/branches/swig-redo/src/engine/Group.c
   gnucash/branches/swig-redo/src/engine/Group.h
   gnucash/branches/swig-redo/src/engine/Makefile.am
   gnucash/branches/swig-redo/src/engine/Period.c
   gnucash/branches/swig-redo/src/engine/SX-book.c
   gnucash/branches/swig-redo/src/engine/SX-book.h
   gnucash/branches/swig-redo/src/engine/Transaction.c
   gnucash/branches/swig-redo/src/engine/cashobjects.c
   gnucash/branches/swig-redo/src/engine/gnc-budget.c
   gnucash/branches/swig-redo/src/engine/gnc-engine.c
   gnucash/branches/swig-redo/src/engine/gnc-lot.c
   gnucash/branches/swig-redo/src/engine/gnc-pricedb.c
   gnucash/branches/swig-redo/src/engine/gncla-dir.h.in
   gnucash/branches/swig-redo/src/engine/test/Makefile.am
   gnucash/branches/swig-redo/src/engine/test/test-commodities.c
   gnucash/branches/swig-redo/src/engine/test/test-date.c
   gnucash/branches/swig-redo/src/engine/test/test-group-vs-book.c
   gnucash/branches/swig-redo/src/engine/test/test-guid.c
   gnucash/branches/swig-redo/src/engine/test/test-load-engine.c
   gnucash/branches/swig-redo/src/engine/test/test-lots.c
   gnucash/branches/swig-redo/src/engine/test/test-numeric.c
   gnucash/branches/swig-redo/src/engine/test/test-object.c
   gnucash/branches/swig-redo/src/engine/test/test-period.c
   gnucash/branches/swig-redo/src/engine/test/test-query.c
   gnucash/branches/swig-redo/src/engine/test/test-querynew.c
   gnucash/branches/swig-redo/src/engine/test/test-resolve-file-path.c
   gnucash/branches/swig-redo/src/engine/test/test-scm-query.c
   gnucash/branches/swig-redo/src/engine/test/test-split-vs-account.c
   gnucash/branches/swig-redo/src/engine/test/test-transaction-reversal.c
   gnucash/branches/swig-redo/src/engine/test/test-transaction-voiding.c
   gnucash/branches/swig-redo/src/gnc-module/Makefile.am
   gnucash/branches/swig-redo/src/gnc-module/gnc-module.c
   gnucash/branches/swig-redo/src/gnc-module/test/test-dynload.c
   gnucash/branches/swig-redo/src/gnc-test-env
   gnucash/branches/swig-redo/src/gnome-search/Makefile.am
   gnucash/branches/swig-redo/src/gnome-search/search.glade
   gnucash/branches/swig-redo/src/gnome-utils/Makefile.am
   gnucash/branches/swig-redo/src/gnome-utils/dialog-account.c
   gnucash/branches/swig-redo/src/gnome-utils/dialog-preferences.c
   gnucash/branches/swig-redo/src/gnome-utils/dialog-reset-warnings.c
   gnucash/branches/swig-redo/src/gnome-utils/dialog-utils.c
   gnucash/branches/swig-redo/src/gnome-utils/druid-gconf-setup.c
   gnucash/branches/swig-redo/src/gnome-utils/glade/transfer.glade
   gnucash/branches/swig-redo/src/gnome-utils/gnc-date-format.c
   gnucash/branches/swig-redo/src/gnome-utils/gnc-dialog.c
   gnucash/branches/swig-redo/src/gnome-utils/gnc-druid-provider-file-gnome.c
   gnucash/branches/swig-redo/src/gnome-utils/gnc-embedded-window.c
   gnucash/branches/swig-redo/src/gnome-utils/gnc-file.c
   gnucash/branches/swig-redo/src/gnome-utils/gnc-gnome-utils.c
   gnucash/branches/swig-redo/src/gnome-utils/gnc-main-window.c
   gnucash/branches/swig-redo/src/gnome-utils/gnc-plugin.c
   gnucash/branches/swig-redo/src/gnome-utils/gnc-plugin.h
   gnucash/branches/swig-redo/src/gnome-utils/gnc-query-list.c
   gnucash/branches/swig-redo/src/gnome-utils/gnc-tree-model-account-types.c
   gnucash/branches/swig-redo/src/gnome-utils/gnc-tree-model-account-types.h
   gnucash/branches/swig-redo/src/gnome-utils/gnc-tree-view.c
   gnucash/branches/swig-redo/src/gnome-utils/schemas/Makefile.am
   gnucash/branches/swig-redo/src/gnome-utils/search-param.c
   gnucash/branches/swig-redo/src/gnome-utils/search-param.h
   gnucash/branches/swig-redo/src/gnome-utils/test/test-gnc-recurrence.c
   gnucash/branches/swig-redo/src/gnome/
   gnucash/branches/swig-redo/src/gnome/Makefile.am
   gnucash/branches/swig-redo/src/gnome/dialog-print-check.c
   gnucash/branches/swig-redo/src/gnome/druid-acct-period.c
   gnucash/branches/swig-redo/src/gnome/druid-hierarchy.c
   gnucash/branches/swig-redo/src/gnome/glade/account.glade
   gnucash/branches/swig-redo/src/gnome/glade/commodities.glade
   gnucash/branches/swig-redo/src/gnome/glade/price.glade
   gnucash/branches/swig-redo/src/gnome/glade/stocks.glade
   gnucash/branches/swig-redo/src/gnome/gnc-plugin-page-account-tree.c
   gnucash/branches/swig-redo/src/gnome/schemas/Makefile.am
   gnucash/branches/swig-redo/src/gnome/schemas/apps_gnucash_warnings.schemas.in
   gnucash/branches/swig-redo/src/gnome/top-level.c
   gnucash/branches/swig-redo/src/gnome/window-reconcile.c
   gnucash/branches/swig-redo/src/import-export/Makefile.am
   gnucash/branches/swig-redo/src/import-export/hbci/Makefile.am
   gnucash/branches/swig-redo/src/import-export/hbci/dialog-hbcitrans.c
   gnucash/branches/swig-redo/src/import-export/hbci/dialog-hbcitrans.h
   gnucash/branches/swig-redo/src/import-export/hbci/druid-hbci-initial.c
   gnucash/branches/swig-redo/src/import-export/hbci/gnc-hbci-kvp.c
   gnucash/branches/swig-redo/src/import-export/hbci/gnc-hbci-transfer.c
   gnucash/branches/swig-redo/src/import-export/hbci/gnc-hbci-utils.c
   gnucash/branches/swig-redo/src/import-export/hbci/gnc-hbci-utils.h
   gnucash/branches/swig-redo/src/import-export/hbci/gnc-plugin-hbci-ui.xml
   gnucash/branches/swig-redo/src/import-export/hbci/gnc-plugin-hbci.c
   gnucash/branches/swig-redo/src/import-export/hbci/hbci-interaction.c
   gnucash/branches/swig-redo/src/import-export/hbci/hbci-interaction.h
   gnucash/branches/swig-redo/src/import-export/hbci/schemas/Makefile.am
   gnucash/branches/swig-redo/src/import-export/import-account-matcher.c
   gnucash/branches/swig-redo/src/import-export/import-match-map.c
   gnucash/branches/swig-redo/src/import-export/qif-import/Makefile.am
   gnucash/branches/swig-redo/src/import-export/qif-import/test/Makefile.am
   gnucash/branches/swig-redo/src/import-export/qif-io-core/Makefile.am
   gnucash/branches/swig-redo/src/import-export/qif/Makefile.am
   gnucash/branches/swig-redo/src/import-export/schemas/Makefile.am
   gnucash/branches/swig-redo/src/import-export/test/Makefile.am
   gnucash/branches/swig-redo/src/import-export/test/test-import-parse.c
   gnucash/branches/swig-redo/src/network-utils/test/Makefile.am
   gnucash/branches/swig-redo/src/register/ledger-core/split-register-control.c
   gnucash/branches/swig-redo/src/register/ledger-core/split-register.c
   gnucash/branches/swig-redo/src/register/register-core/Makefile.am
   gnucash/branches/swig-redo/src/report/locale-specific/us/Makefile.am
   gnucash/branches/swig-redo/src/report/locale-specific/us/test/Makefile.am
   gnucash/branches/swig-redo/src/report/report-gnome/Makefile.am
   gnucash/branches/swig-redo/src/report/report-system/Makefile.am
   gnucash/branches/swig-redo/src/report/report-system/test/Makefile.am
   gnucash/branches/swig-redo/src/report/standard-reports/Makefile.am
   gnucash/branches/swig-redo/src/report/standard-reports/budget.scm
   gnucash/branches/swig-redo/src/report/standard-reports/test/Makefile.am
   gnucash/branches/swig-redo/src/report/standard-reports/transaction.scm
   gnucash/branches/swig-redo/src/report/stylesheets/Makefile.am
   gnucash/branches/swig-redo/src/report/stylesheets/test/Makefile.am
   gnucash/branches/swig-redo/src/report/utility-reports/Makefile.am
   gnucash/branches/swig-redo/src/report/utility-reports/test/Makefile.am
   gnucash/branches/swig-redo/src/scm/Makefile.am
   gnucash/branches/swig-redo/src/tax/us/Makefile.am
Log:
Rebase the swig-redo branch on trunk at r15000.
Based on the number of merge conflicts (almost every Makefile.am) I'm
rebasing the branch before merging into trunk.


_______________________________________________
gnucash-patches mailing list
[hidden email]
https://lists.gnucash.org/mailman/listinfo/gnucash-patches