gnucash master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Wed May 7 12:34:48 EDT 2014
Updated via https://github.com/Gnucash/gnucash/commit/4115c439 (commit)
via https://github.com/Gnucash/gnucash/commit/1d76256f (commit)
via https://github.com/Gnucash/gnucash/commit/49a5909f (commit)
via https://github.com/Gnucash/gnucash/commit/45cb5504 (commit)
via https://github.com/Gnucash/gnucash/commit/ae98012d (commit)
via https://github.com/Gnucash/gnucash/commit/9d405123 (commit)
via https://github.com/Gnucash/gnucash/commit/ec9bd763 (commit)
from https://github.com/Gnucash/gnucash/commit/e818c21a (commit)
commit 4115c439204eeda72f00fffd771afbc953533e97
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 7 18:18:24 2014 +0200
Reapply "Fix bad qof_instance crash in dialog-payments"
This reverts commit b81289acc66340c74a4b7ed32d0dfffef4a87c16.
commit 1d76256f92138aefe24f224cb0bd0ee266805413
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 7 18:18:14 2014 +0200
Reapply "Fix typo in test-engine-kvp-properties."
This reverts commit c475b9f8c7545e1f4dc3b1e0a3b9b6b217a30719.
commit 49a5909ff243e1cd776993b9bb4d570b832776f2
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 7 17:55:42 2014 +0200
Fixes necessary to marry private-kvp branch with c++ work
commit 45cb5504f3c7c0a8c9fa8917866e0addd349abbd
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 7 15:37:14 2014 +0200
Merge branch 'private-kvp' into master again
This was done by branching right before the original merge
and redoing a clean merge of the private-kvp branch again.
This result was then cherry-picked onto master with
git cherry-pick <merge-commit> -m 1
It was done like this because git merge would consider
the private-kvp branch already merged even after a revert
(see git-revert man page) and won't allow to merge a
second time on the same branch.
Resolved conflicts:
README.dependencies
src/app-utils/gnc-sx-instance-model.c
src/engine/cap-gains.c
src/engine/test/Makefile.am
src/gnome/assistant-hierarchy.c
src/import-export/import-match-map.c
src/import-export/import-utilities.c
src/import-export/ofx/gnc-ofx-kvp.c
src/libqof/qof/qofbook.cpp
src/libqof/qof/qofinstance-p.h
src/libqof/qof/qofinstance.cpp
src/libqof/qof/test/test-kvp_frame.c
src/report/report-gnome/gnc-plugin-page-report.c
commit ae98012d0c03c1fc6732c7cb82bf52050e3789bf
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 7 18:08:34 2014 +0200
Revert "Merge branch 'private-kvp'"
This reverts commit f49983b8012197933c793fe94994ac5afa1d8d75, reversing
changes made to acad5a02bbc04cb17b33c89ed36d839416db8f10.
commit 9d4051230721883f70ed03de9fad99a314f4a4e5
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 7 17:57:47 2014 +0200
Revert "Fix typo in test-engine-kvp-properties."
This reverts commit ac9a6ae606e67f8ca7a7fffd75a7f6c8dcc75060.
commit ec9bd763d133c07a26c741fadd5309aee7b70630
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Wed May 7 17:57:28 2014 +0200
Revert "Fix bad qof_instance crash in dialog-payments"
This reverts commit edd85faad75055231cc58779d2c677fc61cc9492.
Summary of changes:
src/import-export/CMakeLists.txt | 2 +
src/import-export/import-match-map.c | 545 -----------------------
src/import-export/import-utilities.c | 2 -
src/libqof/qof/qofbook.cpp | 2 +-
src/libqof/qof/qoflog.cpp | 4 +-
src/libqof/qof/test/test-kvp_frame.c | 2 +-
src/report/report-gnome/gnc-plugin-page-report.c | 23 +-
7 files changed, 21 insertions(+), 559 deletions(-)
delete mode 100644 src/import-export/import-match-map.c
More information about the gnucash-patches
mailing list