# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1128840974 0
# Node ID a9e534a7e62cfefb1d50802dc4577d61595b9568
# Parent  f9fb6f17633c9b0b2ff8860c3ea45a49f6b465a0
* emacs.c (standard_args): Removed options -i, -itype, --icon-type,
added -nb, --no-bitmap-icon.

* xfns.c (Fx_create_frame): Make bitmapIcon have default on.

diff -r f9fb6f17633c -r a9e534a7e62c src/ChangeLog
--- a/src/ChangeLog	Sun Oct 09 02:08:54 2005 +0000
+++ b/src/ChangeLog	Sun Oct 09 06:56:14 2005 +0000
@@ -1,3 +1,10 @@
+2005-10-09  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* emacs.c (standard_args): Removed options -i, -itype, --icon-type, 
+	added -nb, --no-bitmap-icon.
+
+	* xfns.c (Fx_create_frame): Make bitmapIcon have default on.
+
 2005-10-08  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* macgui.h (MAX_CLIP_RECTS): New define.