Merge commit '0c6dee4befebf823d839d1092bcae79afbf4f12e' into merge/libosmium-2.11.0

This commit is contained in:
Michael Krasnyk
2017-01-20 14:05:21 +01:00
231 changed files with 2732 additions and 1500 deletions
+3 -3
View File
@@ -152,7 +152,7 @@ FULL_PATH_NAMES = YES
# will be relative from the directory where doxygen is started.
# This tag requires that the tag FULL_PATH_NAMES is set to YES.
STRIP_FROM_PATH = @PROJECT_SOURCE_DIR@/include
STRIP_FROM_PATH = @PROJECT_SOURCE_DIR@
# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
# path mentioned in the documentation of a class, which tells the reader which
@@ -755,7 +755,7 @@ WARN_LOGFILE =
# Note: If this tag is empty the current directory is searched.
INPUT = @PROJECT_SOURCE_DIR@/include/osmium \
@PROJECT_SOURCE_DIR@/doc/doc.txt
@PROJECT_SOURCE_DIR@/doc/doc.md
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -891,7 +891,7 @@ FILTER_SOURCE_PATTERNS =
# (index.html). This can be useful if you have a project on for instance GitHub
# and want to reuse the introduction page also for the doxygen output.
USE_MDFILE_AS_MAINPAGE =
USE_MDFILE_AS_MAINPAGE = @PROJECT_SOURCE_DIR@/doc/doc.md
#---------------------------------------------------------------------------
# Configuration options related to source browsing
+21
View File
@@ -0,0 +1,21 @@
Osmium is a fast and flexible C++ library for working with OpenStreetMap
data.
This is the API documentation that was automatically created from the
source code. For more information about the Osmium Library see
http://osmcode.org/libosmium .
Osmium is free software and available under the Boost Software License.
The source code is available at https://github.com/osmcode/libosmium .
Osmium is a header-only library. You do not need to compile and link it,
just include the headers you need.
Everything in namespaces called "detail" is for internal Osmium use only,
do not depend on it in your code. Do not include any include files in
directories named "detail" directly. Include files in directories called
"experimental" and everything in namespaces called "experimental" is
unsupported and may change at any time regardless of the status of the rest
of the library.
-26
View File
@@ -1,26 +0,0 @@
/**
* @mainpage
*
* Osmium is a fast and flexible C++ library for working with OpenStreetMap
* data.
*
* This is the API documentation that was automatically created from the
* source code. For more information about the Osmium Library see
* http://osmcode.org/libosmium .
*
* Osmium is free software and available under the Boost Software License.
* The source code is available at https://github.com/osmcode/libosmium .
*
* Osmium is a header-only library. You do not need to compile and link it,
* just include the headers you need.
*
* Everything in namespaces called "detail" is for internal Osmium use only,
* do not depend on it in your code. Do not include any include files in
* directories named "detail" directly. Include files in directories called
* "experimental" and everything in namespaces called "experimental" is
* unsupported and may change at any time regardless of the status of the rest
* of the library.
*
*/