Resolved CVS conflict

[wxWidgets.git] / include / wx / wx_cwc.h

diff --git a/include/wx/wx_cwc.h b/include/wx/wx_cwc.h
index 26fdcd80ccc228f5da9ae17e47a94477d05a4849..18007f921fe25281d0625caec933baa1c6e3effc 100644 (file)
--- a/include/wx/wx_cwc.h
+++ b/include/wx/wx_cwc.h
@@ -6,7 +6,7 @@
 // Created:     12/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:    wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CW__
@@ -18,31 +18,31 @@
 
 #if __option(profile)
 #ifdef __cplusplus
-       #ifdef __MACH__
-               #include <wx_Mach++_prof.mch>
-       #elif __POWERPC__
-               #include <wx_Carbon++_prof.mch>
-       #endif
+    #ifdef __MACH__
+        #include "wx_Mach++_prof.mch"
+    #elif __POWERPC__
+        #include "wx_Carbon++_prof.mch"
+    #endif
 #else
-       #ifdef __MACH__
-               #include <wx_Mach_prof.mch>
-       #elif __POWERPC__
-               #include <wx_Carbon_prof.mch>
-       #endif
+    #ifdef __MACH__
+        #include "wx_Mach_prof.mch"
+    #elif __POWERPC__
+        #include "wx_Carbon_prof.mch"
+    #endif
 #endif
 #else
 #ifdef __cplusplus
-       #ifdef __MACH__
-               #include <wx_Mach++.mch>
-       #elif __POWERPC__
-               #include <wx_Carbon++.mch>
-       #endif
+    #ifdef __MACH__
+        #include "wx_Mach++.mch"
+    #elif __POWERPC__
+        #include "wx_Carbon++.mch"
+    #endif
 #else
-       #ifdef __MACH__
-               #include <wx_Mach.mch>
-       #elif __POWERPC__
-               #include <wx_Carbon.mch>
-       #endif
+    #ifdef __MACH__
+        #include "wx_Mach.mch"
+    #elif __POWERPC__
+        #include "wx_Carbon.mch"
+    #endif
 #endif
 #endif
 #endif