gnucash master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/50deaa0d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/66aeb610 (commit)
	from  https://github.com/Gnucash/gnucash/commit/823b41d6 (commit)



commit 50deaa0d3c023a0dbb4655842fab4bf5cd998da0
Merge: 823b41d 66aeb61
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sun Jul 2 12:28:48 2017 +0200

    Merge branch 'fix-win-compile' of https://github.com/kcwu/gnucash


commit 66aeb6100876a526618400ca10a599dc5a9a3b2b
Author: Kuang-che Wu <kcwu at csie.org>
Date:   Mon Jun 26 02:02:34 2017 +0800

    Fix import-export compile on windows

diff --git a/src/import-export/test/Makefile.am b/src/import-export/test/Makefile.am
index 7bfe20d..024b3a2 100644
--- a/src/import-export/test/Makefile.am
+++ b/src/import-export/test/Makefile.am
@@ -68,8 +68,8 @@ test_import_pending_matches_LDADD = \
   ${top_builddir}/src/libqof/qof/libgnc-qof.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ../libgncmod-generic-import.la \
-  ${top_builddir}/src/test-core/libtest-core.la \
   ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
+  ${top_builddir}/src/test-core/libtest-core.la \
   ${GLIB_LIBS}
 
 test_import_pending_matches_CFLAGS = $(AM_CPPFLAGS)



Summary of changes:
 src/import-export/test/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)