From ade8486dd0972f48cd6ccb8acacf533d568cb779 Mon Sep 17 00:00:00 2001
From: theraven <theraven@72102866-910b-0410-8b05-ffd578937521>
Date: Tue, 23 Nov 2010 13:16:53 +0000
Subject: [PATCH] Added ChangeLog entry from last commit

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@31644 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                            | 10 ++++++++++
 Headers/Foundation/NSDateFormatter.h | 10 +++++++---
 Source/NSDateFormatter.m             |  9 +++++++++
 Tools/mkchlog.sh                     |  5 +++++
 4 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 Tools/mkchlog.sh

diff --git a/ChangeLog b/ChangeLog
index a0e7cc68b..9b52c2917 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-19 22:15  theraven
+
+	* libs/base/trunk/Source/GSICUString.h: Fixed missing newline at
+	  end of GSICUString.h
+
+2010-11-19 22:15  theraven
+
+	* libs/base/trunk/Source/GSICUString.h: Fixed missing newline at
+	  end of GSICUString.h
+
 2010-11-19  Niels Grewe <niels.grewe@halbordnung.de>
 
 	* Source/NSRegularExpression.m: Rearrange for non-C99 compliant
diff --git a/Headers/Foundation/NSDateFormatter.h b/Headers/Foundation/NSDateFormatter.h
index ce796474f..5c6bf4238 100644
--- a/Headers/Foundation/NSDateFormatter.h
+++ b/Headers/Foundation/NSDateFormatter.h
@@ -105,9 +105,7 @@ extern "C" {
 #if	GS_EXPOSE(NSDateFormatter)
   NSString	*_dateFormat;
   BOOL		_allowsNaturalLanguage;
-#endif
-#if	!GS_NONFRAGILE
-  void		*_unused;
+  NSLocale  *locale;
 #endif
 }
 
@@ -141,8 +139,14 @@ extern "C" {
  *  specifies strings similar to "June 18, 1991".
  */
 - (NSString *) dateFormat;
+- (NSLocale*)locale;
+- (void)setLocale: (NSLocale*)aLocale;
 @end
 
+extern NSString *const NSDateFormatterLongStyle;
+extern NSString *const NSDateFormatterShortStyle;
+extern NSString *const NSDateFormatterNoStyle;
+
 #endif
 
 #if	defined(__cplusplus)
diff --git a/Source/NSDateFormatter.m b/Source/NSDateFormatter.m
index de31bd046..5921788d9 100644
--- a/Source/NSDateFormatter.m
+++ b/Source/NSDateFormatter.m
@@ -62,6 +62,7 @@
 
 - (void) dealloc
 {
+  RELEASE(locale);
   RELEASE(_dateFormat);
   [super dealloc];
 }
@@ -70,6 +71,14 @@
 {
   return [self stringForObjectValue: anObject];
 }
+- (NSLocale*)locale
+{
+	return locale;
+}
+- (void)setLocale: (NSLocale*)aLocale
+{
+	ASSIGN(locale, aLocale);
+}
 
 - (void) encodeWithCoder: (NSCoder*)aCoder
 {
diff --git a/Tools/mkchlog.sh b/Tools/mkchlog.sh
new file mode 100644
index 000000000..382941d26
--- /dev/null
+++ b/Tools/mkchlog.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+svn log -rPREV --xml --verbose | xsltproc /usr/local/share/svn2cl/svn2cl.xsl - > ChangeLog.new
+cat ChangeLog >> ChangeLog.new
+mv ChangeLog.new ChangeLog
+svn commit -m 'Added ChangeLog entry from last commit'