Geert Janssens 2364c5607f Merge branch 'maint' into unstable ...

Resolved conflicts:
	gnucash/gnome-search/dialog-search.c
	gnucash/gnome-utils/gnc-splash.c
	gnucash/import-export/aqb/gnc-plugin-aqbanking.c
	gnucash/import-export/import-account-matcher.c
	po/de.po
	src/report/standard-reports/budget-barchart.scm
	src/report/standard-reports/budget.scm

Note the de.po conflict was resolved by dropping all changes
and merging the file again with gnucash.pot (generated after
the merge but before committing).

2018-01-17 18:08:05 +01:00

..

accounts

Merge branch 'maint' into unstable

2018-01-17 18:08:05 +01:00

checks

Use GNUInstallDirs in CMake Builds

2017-11-28 14:25:35 -08:00

pixmaps

More GNUInstallDirs path fixes.

2017-12-01 13:56:52 -08:00

CMakeLists.txt

Move accounts, checks and pixmaps into a data directory

2017-08-11 22:42:15 +02:00

Makefile.am

Move accounts, checks and pixmaps into a data directory

2017-08-11 22:42:15 +02:00