aboutsummaryrefslogtreecommitdiffstats
path: root/os/kernel/include/ch.h
diff options
context:
space:
mode:
authorbarthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-12-06 14:13:45 +0000
committerbarthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-12-06 14:13:45 +0000
commitd34bc423c805e7724898427cb5c4cfe69f596f30 (patch)
tree99bb722b718cfe8792701e7bc94671c9ef97628a /os/kernel/include/ch.h
parent60e97e1c62c615c9e07042ec20fc8d354245aba9 (diff)
parent0faef9a2928309385c52f25fb892ac46ced093ab (diff)
downloadChibiOS-d34bc423c805e7724898427cb5c4cfe69f596f30.tar.gz
ChibiOS-d34bc423c805e7724898427cb5c4cfe69f596f30.tar.bz2
ChibiOS-d34bc423c805e7724898427cb5c4cfe69f596f30.zip
I2C. Merged code from trunk.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/i2c_dev@3561 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/kernel/include/ch.h')
-rw-r--r--os/kernel/include/ch.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h
index e751e0fc5..14fefa558 100644
--- a/os/kernel/include/ch.h
+++ b/os/kernel/include/ch.h
@@ -40,7 +40,7 @@
/**
* @brief Kernel version string.
*/
-#define CH_KERNEL_VERSION "2.3.4unstable"
+#define CH_KERNEL_VERSION "2.3.5unstable"
/**
* @name Kernel version
@@ -59,7 +59,7 @@
/**
* @brief Kernel version patch number.
*/
-#define CH_KERNEL_PATCH 4
+#define CH_KERNEL_PATCH 5
/** @} */
/*