changeset 78:fc82e57437df

Merge
author David Pineau <dav.pineau@gmail.com>
date Fri, 02 Apr 2010 12:21:23 +0200
parents b08270288b34 (current diff) 1c368fcf2969 (diff)
children bf311f8f6f57
files
diffstat 4 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Apr 02 12:20:44 2010 +0200
+++ b/.hgtags	Fri Apr 02 12:21:23 2010 +0200
@@ -1,1 +1,2 @@
 4ddbd44f8ac53d5a3aa455fa259f8c673d10645f 0.0.1
+3249e9edc5d930c71b1a9d4d6013696e3a40944b 0.0.2
--- a/CHANGELOG	Fri Apr 02 12:20:44 2010 +0200
+++ b/CHANGELOG	Fri Apr 02 12:21:23 2010 +0200
@@ -1,8 +1,9 @@
+0.0.3:
+
 0.0.2:
 
  * Lot of improvements in the documentation;
  * Many headers fixes (close #8, #9, #11);
- * IEndPoint refactored to allow ipv6 use (close #4) (TODO);
  * Add a CMake finder (close #6).
 
 0.0.1:
--- a/CMakeLists.txt	Fri Apr 02 12:20:44 2010 +0200
+++ b/CMakeLists.txt	Fri Apr 02 12:21:23 2010 +0200
@@ -13,7 +13,7 @@
 
 SET(CPACK_PACKAGE_VERSION_MAJOR "0")
 SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "1")
+SET(CPACK_PACKAGE_VERSION_PATCH "2")
 SET(STREAMIT_API_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 
 MESSAGE(STATUS "Cmake Version : ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
--- a/include/IConfig.hpp	Fri Apr 02 12:20:44 2010 +0200
+++ b/include/IConfig.hpp	Fri Apr 02 12:21:23 2010 +0200
@@ -22,10 +22,7 @@
             /**
              * @brief Get the configuration entries.
              *
-             * At the moment we return a map of strings. We will see if more
-             * complex data structure is required.
-             *
-             * @return the map of key/value found in configuration file.
+             * @return the map of section => key/value found in configuration file.
              * the first level represent the section of the configuration.
              *
              * For example: