diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-24 15:01:35 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-24 15:01:35 +0000 |
| commit | 4919e1f1fc579063ce87066a56d4e2b14291401f (patch) | |
| tree | 3fc81e500df3dcaa305b27df46b676329cbbdf26 /xmerge/source/activesync | |
| parent | 9963ff2ba3af485ac2f419420d9060f3934a0a6a (diff) | |
INTEGRATION: CWS lo8 (1.1.12); FILE MERGED
2005/10/19 09:45:06 lo 1.1.12.2: xmergesync binary to use until build is fixed
2005/08/12 14:14:08 hjs 1.1.12.1: #i48274# find SDK includes
Diffstat (limited to 'xmerge/source/activesync')
| -rw-r--r-- | xmerge/source/activesync/XMergeSync.rc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/xmerge/source/activesync/XMergeSync.rc b/xmerge/source/activesync/XMergeSync.rc index 4cbeb065e0f5..b355bcad7adc 100644 --- a/xmerge/source/activesync/XMergeSync.rc +++ b/xmerge/source/activesync/XMergeSync.rc @@ -7,7 +7,11 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +<<<<<<< XMergeSync.rc +// #include "afxres.h" +======= +//#include "afxres.h" +>>>>>>> 1.1.12.1 ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -17,7 +21,8 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENI) #ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_EIRE +//LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_EIRE +LANGUAGE 0x9, 0x1 #pragma code_page(1252) #endif //_WIN32 |