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 c1fa2c6b54ba70ed8e1525f89a8cde9406d25fcf..18007f921fe25281d0625caec933baa1c6e3effc 100644 (file)
--- a/include/wx/wx_cwc.h
+++ b/include/wx/wx_cwc.h
@@ -19,29 +19,29 @@
 #if __option(profile)
 #ifdef __cplusplus
     #ifdef __MACH__
-        #include <wx_Mach++_prof.mch>
+        #include "wx_Mach++_prof.mch"
     #elif __POWERPC__
-        #include <wx_Carbon++_prof.mch>
+        #include "wx_Carbon++_prof.mch"
     #endif
 #else
     #ifdef __MACH__
-        #include <wx_Mach_prof.mch>
+        #include "wx_Mach_prof.mch"
     #elif __POWERPC__
-        #include <wx_Carbon_prof.mch>
+        #include "wx_Carbon_prof.mch"
     #endif
 #endif
 #else
 #ifdef __cplusplus
     #ifdef __MACH__
-        #include <wx_Mach++.mch>
+        #include "wx_Mach++.mch"
     #elif __POWERPC__
-        #include <wx_Carbon++.mch>
+        #include "wx_Carbon++.mch"
     #endif
 #else
     #ifdef __MACH__
-        #include <wx_Mach.mch>
+        #include "wx_Mach.mch"
     #elif __POWERPC__
-        #include <wx_Carbon.mch>
+        #include "wx_Carbon.mch"
     #endif
 #endif
 #endif