From d43d7d21486cad67aa7a83ae2b99f179adfb665f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Thu, 4 Feb 2016 10:00:15 +0100
Subject: [PATCH] Updated changelog of 6.0 branch

---
 Doc/changelog.docu | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Doc/changelog.docu b/Doc/changelog.docu
index 5e64442c..c79f81c1 100644
--- a/Doc/changelog.docu
+++ b/Doc/changelog.docu
@@ -9,6 +9,10 @@
 
 <tr valign=top><td><b>6.0</b> (?/?/?)</td><td>
 
+<b>IO</b>
+<ul>
+<li>Obj reader: added texCoord3d functions to objloader</li>
+</ul>
 
 <b>VectorT</b>
 <ul>
@@ -28,6 +32,11 @@
 <li>Updated c++11 ifdefs to use c++11 (starting with VS1015)</li>
 </ul>
 
+<b>Python Interface</b>
+<ul>
+<li>Fixed segfault in decimater due to a bad pointer</li>
+</ul>
+
 </tr>