prep version 2.3.2

svn path=/trunk/yarp2/; revision=8386
robotology · Nov 29, 2010 · c3d0695 · c3d0695
1 parent b2d4ff7
commit c3d0695
Show file tree

Hide file tree

Showing 8 changed files with 152 additions and 113 deletions.
diff --git a/COPYING b/COPYING
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-29  Paul Fitzpatrick  <paulfitz@nominal.csail.mit.edu>
+
+	* conf/YarpVersion.cmake: bump version to 2.3.2
+
 2010-11-26  Paul Fitzpatrick  <paulfitz@alum.mit.edu>
 
 	* src/libYARP_dev/src/ServerControlBoard.cpp: when YARP_QUIET
@@ -3429,7 +3433,7 @@
 	questions from someone evaluating YARP.
 
 	* src/libYARP_dev/src/opencv_grabber: Added --loop option for
-	opencv_grabber, [thanks Alex Bernardino] for suggestion.
+	opencv_grabber, [thanks Alexandre Bernardino] for suggestion.
 
 2006-12-15  Paul Fitzpatrick  <paulfitz@alum.mit.edu>
 

diff --git a/conf/YarpVersion.cmake b/conf/YarpVersion.cmake
@@ -6,9 +6,9 @@
 
 set(YARP_VERSION_MAJOR "2")
 set(YARP_VERSION_MINOR "3")
-set(YARP_VERSION_PATCH "1")
+set(YARP_VERSION_PATCH "2")
 set(YARP_VERSION_MODIFIER "")
-set(YARP_VERSION_ABI "0")
+set(YARP_VERSION_ABI "1")
 
 set(CPACK_PACKAGE_VERSION_MAJOR "${YARP_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${YARP_VERSION_MINOR}")

diff --git a/src/libYARP_OS/include/hmac/hmac_sha2.h b/src/libYARP_OS/include/hmac/hmac_sha2.h
@@ -31,6 +31,9 @@
  * SUCH DAMAGE.
  */
 
+// License summary for YARP
+// CopyPolicy: 3-clause BSD
+
 #ifndef _HMAC_SHA2_H
 #define _HMAC_SHA2_H
 

diff --git a/src/libYARP_OS/include/hmac/sha2.h b/src/libYARP_OS/include/hmac/sha2.h
@@ -31,6 +31,9 @@
  * SUCH DAMAGE.
  */
 
+// License summary for YARP
+// CopyPolicy: 3-clause BSD
+
 #ifndef SHA2_H
 #define SHA2_H
 

diff --git a/src/libYARP_OS/src/hmac_sha2.c b/src/libYARP_OS/src/hmac_sha2.c
@@ -31,6 +31,9 @@
  * SUCH DAMAGE.
  */
 
+// License summary for YARP
+// CopyPolicy: 3-clause BSD
+
 #include <string.h>
 
 #include <hmac/hmac_sha2.h>

diff --git a/src/libYARP_OS/src/sha2.c b/src/libYARP_OS/src/sha2.c
@@ -31,6 +31,9 @@
  * SUCH DAMAGE.
  */
 
+// License summary for YARP
+// CopyPolicy: 3-clause BSD
+
 #if 0
 #define UNROLL_LOOPS /* Enable loops unrolling */
 #endif

diff --git a/src/modules/laserHokuyo/CMakeLists.txt b/src/modules/laserHokuyo/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (C) 2010 Marco Randazzo
+# CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
+
 IF (COMPILE_DEVICE_LIBRARY)
 	PREPARE_DEVICE(laserHokuyo TYPE laserHokuyo INCLUDE laserHokuyo.h)
 ENDIF (COMPILE_DEVICE_LIBRARY)