From 3e6253d5845d5af70e707cc3dfc012728c3837ae Mon Sep 17 00:00:00 2001
From: Sergii Stoian <stoyan255@gmail.com>
Date: Sun, 9 Sep 2012 21:37:08 +0000
Subject: [PATCH] Fox conflict again

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35550 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b8a524479..8463cdd3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,9 +6,8 @@
 
 2012-09-09  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
-	* Source/NSFileManager.m:
-	[createDirectoryAtPath:withIntermediateDirectories:attributes:error:]:
-	Create directories only if it doesn't exist.
+        * Source/NSPropertyList.m (-storeString): Add missing variable
+        declaration on big-endian systems.
 
 2012-09-06  Richard Frith-Macdonald <rfm@gnu.org>