From b465bcc6927dbe5d3682bb542ad1e17e8689a61c Mon Sep 17 00:00:00 2001
From: Olaf Bergmann <bergmann@tzi.org>
Date: Fri, 1 Feb 2013 14:01:33 +0100
Subject: [PATCH] update

---
 ChangeLog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index b29c4de0..f003f7a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-02-01  Olaf Bergmann  <bergmann@tzi.org>
+
+	* coap_time.h (coap_clock_init_impl): fix invalid preprocessor
+	directive. #warning is now only used for gcc only (close sf bug #15)
+
+	* net.c (wellknown_response): applied patch from chrysn to
+	fix bug in generation of .well-known/core representation
+
 2013-01-21  Olaf Bergmann  <bergmann@tzi.org>
 
 	* option.h: renamed option field in coap_opt_iterator_t to