summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2006-06-14 02:53:14 +0000
committerjoncruz <joncruz@users.sourceforge.net>2006-06-14 02:53:14 +0000
commit2fe0719403b50bb2723f50356dc629ae2c3e4a3c (patch)
treefbc426211e52bd2bfabb5568b4d9b5ad79ef502a
parentupdate from wiki (diff)
downloadinkscape-2fe0719403b50bb2723f50356dc629ae2c3e4a3c.tar.gz
inkscape-2fe0719403b50bb2723f50356dc629ae2c3e4a3c.zip
Applied patch #1505765
(bzr r1217)
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.am1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6bdb03ed6..590857a6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
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:
Applied patch #1503864.
diff --git a/Makefile.am b/Makefile.am
index 1c9c7bf1b..1c7df1dc7 100644
--- 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 \