diff options
Diffstat (limited to 'lcms2mt/Projects/VC2010/lcms2mt.rc')
| -rw-r--r-- | lcms2mt/Projects/VC2010/lcms2mt.rc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/lcms2mt/Projects/VC2010/lcms2mt.rc b/lcms2mt/Projects/VC2010/lcms2mt.rc index 2d0d0a8f..65f192bc 100644 --- a/lcms2mt/Projects/VC2010/lcms2mt.rc +++ b/lcms2mt/Projects/VC2010/lcms2mt.rc @@ -66,12 +66,20 @@ END // TEXTINCLUDE // +<<<<<<< e2c48062c190a618a765f443fdfcac76a80d684d 1 TEXTINCLUDE +======= +1 TEXTINCLUDE +>>>>>>> Pull in newly merged and updated LCMS2MT from MuPDF thirdparty repo. BEGIN "resource.h\0" END +<<<<<<< e2c48062c190a618a765f443fdfcac76a80d684d 2 TEXTINCLUDE +======= +2 TEXTINCLUDE +>>>>>>> Pull in newly merged and updated LCMS2MT from MuPDF thirdparty repo. BEGIN "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" "#include ""windows.h""\r\n" @@ -79,7 +87,11 @@ BEGIN "\0" END +<<<<<<< e2c48062c190a618a765f443fdfcac76a80d684d 3 TEXTINCLUDE +======= +3 TEXTINCLUDE +>>>>>>> Pull in newly merged and updated LCMS2MT from MuPDF thirdparty repo. BEGIN "\r\n" "\0" @@ -101,4 +113,7 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED +<<<<<<< e2c48062c190a618a765f443fdfcac76a80d684d +======= +>>>>>>> Pull in newly merged and updated LCMS2MT from MuPDF thirdparty repo. |