aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-06-12 05:56:13 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-06-12 05:56:13 +0000
commitc07c8ab6df0cb5758747847d4fb2c47f833201f9 (patch)
tree03dbbd982e4b96042423a0f0dd4ed9c4f0b60927
parentd54e8eb64d3a79872e55dc246f4adc85d476144f (diff)
downloadChibiOS-c07c8ab6df0cb5758747847d4fb2c47f833201f9.tar.gz
ChibiOS-c07c8ab6df0cb5758747847d4fb2c47f833201f9.tar.bz2
ChibiOS-c07c8ab6df0cb5758747847d4fb2c47f833201f9.zip
Fixed bug 3015109.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2011 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--docs/Doxyfile2
-rw-r--r--os/kernel/include/ch.h8
-rw-r--r--readme.txt3
3 files changed, 8 insertions, 5 deletions
diff --git a/docs/Doxyfile b/docs/Doxyfile
index d3fcde64e..a36862b53 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = ChibiOS/RT
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 1.5.9
+PROJECT_NUMBER = 2.1.0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h
index 42d34fe10..31131ecff 100644
--- a/os/kernel/include/ch.h
+++ b/os/kernel/include/ch.h
@@ -39,22 +39,22 @@
/**
* @brief Kernel version string.
*/
-#define CH_KERNEL_VERSION "1.5.9unstable"
+#define CH_KERNEL_VERSION "2.1.0unstable"
/**
* @brief Kernel version major number.
*/
-#define CH_KERNEL_MAJOR 1
+#define CH_KERNEL_MAJOR 2
/**
* @brief Kernel version minor number.
*/
-#define CH_KERNEL_MINOR 5
+#define CH_KERNEL_MINOR 1
/**
* @brief Kernel version patch number.
*/
-#define CH_KERNEL_PATCH 9
+#define CH_KERNEL_PATCH 0
/*
* Common values.
diff --git a/readme.txt b/readme.txt
index 9f48123cb..ab7e2f881 100644
--- a/readme.txt
+++ b/readme.txt
@@ -58,6 +58,9 @@
*** Releases ***
*****************************************************************************
+*** 2.1.0 ***
+- FIX: Fixed assertion in adcStop() (bug 3015109)(backported in 2.0.0).
+
*** 1.5.9 ***
- FIX: Fixed STM8 baud rate setup error (bug 3010990).
- FIX: Fixed STM8 UART3 driver (bug 3009145).