Applied patch #1505765

diff --git a/ChangeLog b/ChangeLog
index 6bdb03ed6701fbdb6a39a64f9466605a6d9e6975..590857a6efee2fe2abea29eaa6ae4f4e97be646f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-09  Jon A. Cruz  <jon@joncruz.org>
+
+       * packaging/macosx/Resources/etc/fonts/fonts.conf:
+
+         Applied patch #1505765.
+
 2006-06-09  Jon A. Cruz  <jon@joncruz.org>
 
        * src/object-snapper.cpp, src/selection.cpp, src/selection.h, src/seltrans.cpp:

diff --git a/Makefile.am b/Makefile.am
index 1c9c7bf1b3c58e654abf432b5421473d28b72a97..1c7df1dc74f6c8d57790979e142fb267eab5533e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -112,6 +112,7 @@ EXTRA_DIST = \
        packaging/macosx/Resources/ProgressWindow.nib/objects.xib       \
        packaging/macosx/Resources/bin/getdisplay.sh    \
        packaging/macosx/Resources/bin/inkscape \
+       packaging/macosx/Resources/etc/fonts/fonts.conf \
        packaging/macosx/ScriptExec/English.lproj/main.nib/classes.nib  \
        packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib     \
        packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib  \