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 remote-tracking branch 'origin/webkit' into archive

Browse Source
This commit is contained in:
John Ralls
2014-04-11 14:09:49 -07:00
parent 4e8e98debf 5bc362f687
commit 43c2c33cad
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gnome-utils/Makefile.am
View File

@@ -185,6 +185,10 @@ libgncmod_gnome_utils_la_LIBADD = \
${GUILE_LIBS} \
${GLIB_LIBS} \
${DB_LIBS} \
<<<<<<< HEAD
=======
${QOF_LIBS} \
>>>>>>> origin/webkit
${REGEX_LIBS} \
${LIBXML2_LIBS}