From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Fri, 15 Oct 2004 13:00:39 +0000 (+0000)
Subject: cleanup
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e534c4846145dfc9446784bd1c7b817086a5df8;p=scalable-opengroupware.org

cleanup

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@400 d1b88da0-ebda-0310-925b-ed51d893ca5b
---

diff --git a/OGoContentStore/ChangeLog b/OGoContentStore/ChangeLog
index 28fb3096..57eda4a1 100644
--- a/OGoContentStore/ChangeLog
+++ b/OGoContentStore/ChangeLog
@@ -1,5 +1,7 @@
 2004-10-15  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+	* OCSStringFormatter.[hm]: minor cleanup (v0.9.12)
+
 	* v0.9.11
 
 	* OCSStringFormatter.[hm]: new class to format strings according to
diff --git a/OGoContentStore/OCSStringFormatter.h b/OGoContentStore/OCSStringFormatter.h
index 2a25e49b..0426d06a 100644
--- a/OGoContentStore/OCSStringFormatter.h
+++ b/OGoContentStore/OCSStringFormatter.h
@@ -20,15 +20,11 @@
 */
 // $Id$
 
+#ifndef	__OGoContentStore_OCSStringFormatter_H__
+#define	__OGoContentStore_OCSStringFormatter_H__
 
-#ifndef	__OCSStringFormatter_H_
-#define	__OCSStringFormatter_H_
-
-
-#import <Foundation/Foundation.h>
 #include <NGExtensions/NSString+Escaping.h>
 
-
 @interface OCSStringFormatter : NSObject < NGStringEscaping >
 {
 }
@@ -38,4 +34,4 @@
 
 @end
 
-#endif	/* __OCSStringFormatter_H_ */
+#endif	/* __OGoContentStore_OCSStringFormatter_H__ */
diff --git a/OGoContentStore/OCSStringFormatter.m b/OGoContentStore/OCSStringFormatter.m
index ed43411d..d7c84a72 100644
--- a/OGoContentStore/OCSStringFormatter.m
+++ b/OGoContentStore/OCSStringFormatter.m
@@ -20,9 +20,8 @@
 */
 // $Id$
 
-
-#import "OCSStringFormatter.h"
-
+#include "OCSStringFormatter.h"
+#include "common.h"
 
 @implementation OCSStringFormatter
 
diff --git a/OGoContentStore/Version b/OGoContentStore/Version
index 77dfcdc5..7254d8b0 100644
--- a/OGoContentStore/Version
+++ b/OGoContentStore/Version
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION=0
 MINOR_VERSION=9
-SUBMINOR_VERSION:=11
+SUBMINOR_VERSION:=12
 
 # v0.9.11 requires libFoundation   v1.0.63
 # v0.9.11 requires libNGExtensions v4.3.125