From 2a885a476d7842d1197df997ac6910d71fb15668 Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Tue, 2 Nov 2010 10:55:32 +0000
Subject: [PATCH] Bumped version number

---
 core/contiki-version.h | 4 ++--
 doc/Doxyfile           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/contiki-version.h b/core/contiki-version.h
index cfbcebe74..146a5ae1d 100644
--- a/core/contiki-version.h
+++ b/core/contiki-version.h
@@ -30,13 +30,13 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: contiki-version.h,v 1.9 2010/01/29 18:04:54 adamdunkels Exp $
+ * $Id: contiki-version.h,v 1.10 2010/11/02 10:55:32 adamdunkels Exp $
  */
 #ifndef __CONTIKI_VERSION__
 #define __CONTIKI_VERSION__
 
 #ifndef CONTIKI_VERSION_STRING
-#define CONTIKI_VERSION_STRING "Contiki 2.4"
+#define CONTIKI_VERSION_STRING "Contiki 2.5"
 #endif /* CONTIKI_VERSION_STRING */
 
 #endif /* __CONTIKI_VERSION__ */
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 9137f5af6..9d06c75d7 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "Contiki 2.4"
+PROJECT_NAME           = "Contiki 2.5"
 PROJECT_NUMBER         = 
 OUTPUT_DIRECTORY       = .
 CREATE_SUBDIRS         = NO
@@ -198,7 +198,7 @@ PERL_PATH              = /usr/bin/perl
 #---------------------------------------------------------------------------
 CLASS_DIAGRAMS         = NO
 HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = NO 
+HAVE_DOT               = NO
 CLASS_GRAPH            = NO
 COLLABORATION_GRAPH    = NO
 GROUP_GRAPHS           = NO