From 9760545b22b9be263e6cc6bc54b98c34261a00f0 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Sat, 2 Feb 2008 10:47:02 -0500
Subject: [PATCH] update changelog

---
 CHANGELOG | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index b88b6a9..0b148dc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,11 @@
   * Add support for putting the move/resize popup in a fixed position on screen
   * Add support for the <active> window placement option
   * New icon by Myles Green
+  * Show an error when the configuration file is not valid, so it doesn't get
+    destroyed by ObConf
+  * Add a --config-file option to specify an alternate configuration file.
+  * Auto-load the same configuration as Openbox is using, if Openbox was run
+    with --config-file
 
 2.0.2:
   * Add Traditional Chinese translation
-- 
2.34.1