2 files changed, 21 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index a937d8a..fb7d990 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
+Changes for 0.1.7:
+*02/01/18:
+   * Fixed ResourceManager 
+   * Changed resources to Resource<T> in class Fluxbox
+   * Added Resource.hh/.cc, XrmDatabaseHelper.hh, NotCopyable.hh
+*02/01/16:
+   * Fixed indent in Window.hh
+*02/01/15:
+   * Fixed exception in FluxboxWindow::FluxboxWindow
+*02/01/14:
+   * Fixed throw statement in FluxboxWindow
+
 Changes for 0.1.6:
-*01/01/11:
+*02/01/11:
    * Fixed small bug in keybindings code, now killwindow and shade will
      work as supposed with tabs. (Claes Nästén)
    * Fixed so it compiles with cygwin (Thanks Eric Nicolas)
diff --git a/doc/Coding_style b/doc/Coding_style
index eff9eea..a5bc90c 100644
--- a/doc/Coding_style
+++ b/doc/Coding_style
@@ -1,8 +1,6 @@
 The coding style is almost the same as i blackbox.
 Instead of 2 spaces there is tab.
-It might look strange now in some places, that is because
-the code hasnt been "translated" to tab 100% yet.
-Use a tab size of 2 and you will be fine.
+Use a tab size of 2 or 4 and you will be fine.
 
 if-statements:
 
@@ -29,6 +27,12 @@ It should look like this
                         stuff);
         }
         
+If a line need to be splited in an if-statement then it should use two 
+tab for indent next row in if-statement like this:
+
+        if ( longline && longline && longling &&
+                        longline && longline && longline)
+                funktion();
 
 The include guards:
 _FILENAME_HH_ 
@@ -46,7 +50,7 @@ type classname::function(...) {
 }
 
 
-enums must be in uppercase letters:
+enums must be in uppercase letters and not in file scope:
 enum {WHITE, RED, BLUE};
 
 Class data members are prefixed by m_