From: Pavel Charvat <pchar@ucw.cz>
Date: Tue, 7 Jan 2014 09:11:17 +0000 (+0100)
Subject: Merge branch 'dev-api' into dev-package
X-Git-Tag: v5.99~50
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=a4f8b029b86d2ca1612a9c2e2795ccea27b15276;p=libucw.git

Merge branch 'dev-api' into dev-package

Conflicts:
	default.cfg
---

a4f8b029b86d2ca1612a9c2e2795ccea27b15276
diff --cc default.cfg
index 53f7a90d,9aa5246c..9a43ab60
--- a/default.cfg
+++ b/default.cfg
@@@ -31,12 -31,12 +31,12 @@@ Set("CONFIG_IMAGES_LIBUNGIF")
  UnSet("CONFIG_IMAGES_LIBGIF");
  UnSet("CONFIG_IMAGES_LIBMAGICK");
  
 -# Libcharset
 +# Libucw-charset
- UnSet("CONFIG_CHARSET");
+ Set("CONFIG_CHARSET");
  Set("CONFIG_CHARSET_UTILS");
  
 -# Libshxml
 -UnSet("CONFIG_SHXML");
 +# Libucw-xml
 +UnSet("CONFIG_XML");
  
  # Return success
  1;