added better proplist warnings when reading non-digit proplist data and fixed screwed Changelog after last commit.

ChangeLog

@@ -98,22 +98,15 @@ Changes since version 0.65.1:
 - added spanish INSTALL file (Efrain Maximiliano Palermo <max_drake2001@yahoo.com.ar>)
 - updated Finnish pots (Tomi Kajala <tomi@iki.fi>)
 - copy/paste launching in Dock
-<<<<<<< ChangeLog
 - fixed switch to wrong workspace bug (Masashi Shimbo <shimbo@cis.ibaraki.ac.jp>)
 - added snprintf and removed XConvertCase usage for portability
 - added wcopy/wpaste scripts from (<luke@research.canon.com.au>)
 - added Xinerama support: see details in NEWS
 - fixed artifact pattern left in TrueColor dithering code (visible with
-tiled gradients)
-
-=======
+  tiled gradients)
 - fixed bug in positioning of window list menu when opened by kbd
 - internal code clean-up with notifications for window state change and other
   stuff
-<<<<<<< ChangeLog
->>>>>>> 1.144
-=======
-- added snprintf implementation for systems that don't have this function
 - removed the libPropList dependancy by adding property list handling
   code to WINGs. This code is not only better integrated with the other
   WINGs data structures, but it's also more robust. Also a backward
@@ -127,7 +120,6 @@ tiled gradients)
 - fixed a few compilation warnings and a problem caused by an uninitialized 
   variable.
 
->>>>>>> 1.150
 
 Changes since version 0.65.0:
 .............................

WINGs/proplist.c

@@ -691,6 +691,10 @@ getPLData(PLData *pldata)
                 ok = 0;
                 break;
             }
+        } else {
+            COMPLAIN(pldata, _("non hexdigit character in PropList data"));
+            ok = 0;
+            break;
         }
     }