Merged a bunch of small changes from trunk to 0.0 and set svn:eol-style

to native for some files that were still missing this property. This is 
a feeble attempt to reduce the amount of conflicts for future merges.

2 files changed, 0 insertions, 100 deletions

diff --git a/CMake/Modules/FindLibXml2.cmake b/CMake/Modules/FindLibXml2.cmake
deleted file mode 100644
index b45d7293..00000000
--- a/CMake/Modules/FindLibXml2.cmake
+++ /dev/null
@@ -1,59 +0,0 @@
-# - Try to find LibXml2
-# Once done this will define
-#
-#  LIBXML2_FOUND - system has LibXml2
-#  LIBXML2_INCLUDE_DIR - the LibXml2 include directory
-#  LIBXML2_LIBRARIES - the libraries needed to use LibXml2
-#  LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2
-#
-# Copyright (c) 2006, Alexander Neundorf <neundorf@kde.org>
-# This code is available under the BSD license, see licenses/BSD for details.
-
-# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
-   # in cache already
-   SET(LibXml2_FIND_QUIETLY TRUE)
-ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
-
-IF (NOT WIN32)
-   # use pkg-config to get the directories and then use these values
-   # in the FIND_PATH() and FIND_LIBRARY() calls
-   INCLUDE(UsePkgConfig)
-   PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags)
-   SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags})
-ENDIF (NOT WIN32)
-
-FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h
-   PATHS
-   ${_LibXml2IncDir}
-   PATH_SUFFIXES libxml2
-   )
-
-FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2
-   PATHS
-   ${_LibXml2LinkDir}
-   )
-
-IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
-   SET(LIBXML2_FOUND TRUE)
-ELSE (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
-   SET(LIBXML2_FOUND FALSE)
-ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
-
-IF (LIBXML2_FOUND)
-   IF (NOT LibXml2_FIND_QUIETLY)
-      MESSAGE(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}")
-   ENDIF (NOT LibXml2_FIND_QUIETLY)
-ELSE (LIBXML2_FOUND)
-   IF (LibXml2_FIND_REQUIRED)
-      MESSAGE(SEND_ERROR "Could NOT find LibXml2")
-   ENDIF (LibXml2_FIND_REQUIRED)
-ENDIF (LIBXML2_FOUND)
-
-MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES)
-
diff --git a/CMake/Modules/FindLibcurl.cmake b/CMake/Modules/FindLibcurl.cmake
deleted file mode 100644
index fe389c49..00000000
--- a/CMake/Modules/FindLibcurl.cmake
+++ /dev/null
@@ -1,41 +0,0 @@
-# - Try to find libcurl
-# Once done this will define
-#
-#  LIBCURL_FOUND - system has libcurl
-#  LIBCURL_INCLUDE_DIR - the libcurl include directory
-#  LIBCURL_LIBRARIES - the libraries needed to use libcurl
-#  LIBCURL_DEFINITIONS - Compiler switches required for using libcurl
-
-IF (Libcurl_INCLUDE_DIR AND Libcurl_LIBRARY)
-   SET(Libcurl_FIND_QUIETLY TRUE)
-ENDIF (Libcurl_INCLUDE_DIR AND Libcurl_LIBRARY)
-
-FIND_PATH(Libcurl_INCLUDE_DIR curl/curl.h
-    /usr/include
-    /usr/local/include
-    )
-
-FIND_LIBRARY(Libcurl_LIBRARY
-    NAMES curl
-    PATHS /usr/lib /usr/local/lib
-    )
-
-IF (Libcurl_INCLUDE_DIR AND Libcurl_LIBRARY)
-    SET(LIBCURL_FOUND TRUE)
-    SET(LIBCURL_INCLUDE_DIR ${Libcurl_INCLUDE_DIR})
-    SET(LIBCURL_LIBRARIES ${Libcurl_LIBRARY})
-ELSE (Libcurl_INCLUDE_DIR AND Libcurl_LIBRARY)
-    SET(LIBCURL_FOUND TRUE)
-ENDIF (Libcurl_INCLUDE_DIR AND Libcurl_LIBRARY)
-
-IF (LIBCURL_FOUND)
-    IF (NOT Libcurl_FIND_QUIETLY)
-        MESSAGE(STATUS "Found libcurl: ${Libcurl_LIBRARY}")
-    ENDIF (NOT Libcurl_FIND_QUIETLY)
-ELSE (LIBCURL_FOUND)
-    IF (Libcurl_FIND_REQUIRED)
-        MESSAGE(SEND_ERROR "Could NOT find libcurl")
-    ENDIF (Libcurl_FIND_REQUIRED)
-ENDIF (LIBCURL_FOUND)
-
-MARK_AS_ADVANCED(Libcurl_INCLUDE_DIR Libcurl_LIBRARY)