gnucash maint: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Sun Jun 3 13:27:53 EDT 2018


Updated	 via  https://github.com/Gnucash/gnucash/commit/eb67baba (commit)
	 via  https://github.com/Gnucash/gnucash/commit/69c81565 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/61071b9f (commit)
	 via  https://github.com/Gnucash/gnucash/commit/435b0ace (commit)
	 via  https://github.com/Gnucash/gnucash/commit/52ac539d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/6be7e82b (commit)
	 via  https://github.com/Gnucash/gnucash/commit/b7a0fb6b (commit)
	 via  https://github.com/Gnucash/gnucash/commit/4a4e7a9a (commit)
	from  https://github.com/Gnucash/gnucash/commit/0064dafb (commit)



commit eb67baba5b18dc4eaba7f29bf306e9091a1ff1d7
Merge: 0064daf 69c8156
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Jun 3 10:26:52 2018 -0700

    Merge Keve Mueller's 'xea-fixes' into maint

commit 69c81565682880df118e71143c0103739ab78294
Author: Keve Müller <keve.mueller at gmail.com>
Date:   Mon May 28 12:15:31 2018 +0200

    Small XML related fixes removing ambiguity improving uniformity
    
    acctchrt_common:
    there is a gratituous "i"
    
    acctchrt_full (ja):
    the Retirement and Spouse's retirement accounts have two parents
    (Investment as well as ROOT), removed ROOT.
    
    uk-vat:
    the root account was pasted a line too high 7y ago. all other files have
    the header block continuous

commit 61071b9f6d9b912ca6418b1b7018e6a3e6fcc6f2
Merge: 435b0ac 61fe647
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sat May 12 14:10:38 2018 +0200

    Merge branch 'maint'

commit 435b0ace18d5d7a89b1fef0449b5861474d5910a
Merge: 52ac539 8b3a874
Author: gnucash-dev <gnucash-dev at DellFedora27VM.home>
Date:   Fri May 4 10:13:29 2018 -0700

    Merge branch 'maint'

commit 52ac539d2334821749241d7e9c8f7bf09116f6cf
Merge: 6be7e82 85c7f7d
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri May 4 10:25:38 2018 +0200

    Merge branch 'maint' into master
    
    Handle conflict between version number reset and lowercasing all commands

commit 6be7e82b9fad874bfb07f07a7fe61c9c902fcddf
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Apr 29 11:50:17 2018 -0700

    Restore version in CMakeLists.txt.
    
    Didn't raise a conflict in the merge for some reason.

commit b7a0fb6bdff0259f832e999e6757c4ce47a53490
Merge: 4a4e7a9 6645d93
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Apr 29 11:48:19 2018 -0700

    Merge branch 'maint'

commit 4a4e7a9a7b543f51dbfd37e726bf72c12c4fee4c
Merge: ba3bf37 5e807a0
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Apr 14 16:45:52 2018 -0700

    Merge branch 'maint'



Summary of changes:
 CMakeLists.txt                               | 4 ++--
 data/accounts/ca/acctchrt_common.gnucash-xea | 2 +-
 data/accounts/en_GB/uk-vat.gnucash-xea       | 2 +-
 data/accounts/ja/acctchrt_full.gnucash-xea   | 6 ++----
 4 files changed, 6 insertions(+), 8 deletions(-)



More information about the gnucash-patches mailing list