IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint' into unstable

Browse Source 
Resolved conflicts:
	CMakeLists.txt
	NEWS
	configure.ac
This commit is contained in:
Geert Janssens
2017-09-27 17:35:13 +02:00
parent d5b0dddb74 5ac849623a
commit b3b4b20e4b
8 changed files with 23256 additions and 23143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/accounts/ca/CMakeLists.txt
View File

@@ -15,7 +15,7 @@ SET(account_DATA
acctchrt_spouseinc.gnucash-xea
acctchrt_spouseretire.gnucash-xea)
SET_DIST_LIST(ca_DIST ${account_DATA} Makefile.am CMakeLists.txt)
SET_DIST_LIST(CA_DIST ${account_DATA} Makefile.am CMakeLists.txt)
INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/ca)
FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/ca)