1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 292b9bdc..045ca353 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-20  David Smith  <dsmith@redhat.com>
+
+	From Lai Jiangshan <laijs@cn.fujitsu.com>
+	* main.cxx (main): Make sure the '-c' and '-x' options can't be
+	specified together.
+
 2007-08-17  Frank Ch. Eigler  <fche@elastic.org>
 
 	As suggested by "Zhaolei" <zhaolei@cn.fujitsu.com>: