hal ChangeLog,1.108,1.109

[Robert Love]

Update of /cvs/hal/hal
In directory pdx:/tmp/cvs-serv5679

Modified Files:
	ChangeLog 
Log Message:
whitespace cleanup in ChangeLog - first commit

Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- a/ChangeLog	20 Apr 2004 20:55:45 -0000	1.108
+++ b/ChangeLog	20 Apr 2004 23:04:20 -0000	1.109
@@ -4,12 +4,12 @@
 
 2004-04-20  Robert Love  <rml at ximian.com>
 
-        * hald/callout.c: hal_property_get_as_string is now to_string, fix
+	* hald/callout.c: hal_property_get_as_string is now to_string, fix
 	leak.
-        * hald/device.c: add hal_device_property_to_string
-        * hald/device.h: add prototype for hal_device_property_to_string
-        * hald/property.c: rename hal_property_get_as_string to to_string
-        * hald/property.h: ditto for the prototype
+	* hald/device.c: add hal_device_property_to_string
+	* hald/device.h: add prototype for hal_device_property_to_string
+	* hald/property.c: rename hal_property_get_as_string to to_string
+	* hald/property.h: ditto for the prototype
 
 2004-04-20  Joe Shaw  <joe at ximian.com>
 
@@ -25,7 +25,6 @@
 	(process_callouts): Change the idle to a timeout.  This is a
 	copout.
 
->>>>>>> 1.107
 2004-04-20  Joe Shaw  <joe at ximian.com>
 
 	* hald/callout.c: Rework this some to make the callouts