Merge branch 'dev-api' into dev-package

Conflicts:
	default.cfg

diff --cc debug/check-configs
Simple merge

diff --cc debug/default.cfg
Simple merge

diff --cc default.cfg
index 53f7a90d283e12735ec9f5930a6db3b27814151c,9aa5246cd52387982da6de3eab2301df8dadb593..9a43ab604455fd65795d87a9cacc45bb739951d6
--- 1/default.cfg
--- 2/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;

diff --cc ucw/daemon.h
Simple merge

diff --cc ucw/default.cfg
Simple merge