Changeset [1172a2c7f37b2f7cdac3c5e83e0e2cfb81062451] by Thell Fowler
Revision 1172a2c7f37b2f7cdac3c5e83e0e2cfb81062451,
committed by Thell Fowler
· February 21st, 2010 @ 04:39 PM
Merge branch 'tf/LH-32v7/introduce-funcguard-category-setup' into my_master
- tf/LH-32v7/introduce-funcguard-category-setup: funcguard: add Scintilla DllMain guard funcguard: add PowerEditor WinMain.cpp guards scintilla: add funcguard category setup scintilla: add Shipping configuration common: make npp_debug common and add to Scintilla powereditor: introduce funcguard category setup
Conflicts:
.gitignore
scintilla/src/precompiled_headers.h
http://github.com/almostautomated/npp-community/commit/1172a2c7f37b...
25 changed files
-
A
PowerEditor/src/MISC/Debug/.gitignore -
A
PowerEditor/src/MISC/Debug/FuncGuards.cpp -
A
PowerEditor/src/MISC/Debug/FuncGuardsImport.h -
A
PowerEditor/src/MISC/Debug/FuncGuards_skel.h -
A
common/MISC/Common/CommonGenerics.h -
A
common/MISC/Debug/npp_debug.cpp -
A
common/MISC/Debug/npp_debug.h -
A
scintilla/src/MISC/Debug/.gitignore -
A
scintilla/src/MISC/Debug/FuncGuards.cpp -
A
scintilla/src/MISC/Debug/FuncGuardsImport.h -
A
scintilla/src/MISC/Debug/FuncGuards_skel.h -
R
PowerEditor/src/MISC/Common/CommonGenerics.h -
R
PowerEditor/src/MISC/Debug/npp_debug.cpp -
R
PowerEditor/src/MISC/Debug/npp_debug.h -
M
.gitignore -
M
PowerEditor/src/precompiled_headers.h -
M
PowerEditor/src/winmain.cpp -
M
PowerEditor/visual.net/notepadPlus.8.vcproj -
M
PowerEditor/visual.net/notepadPlus.9.vcproj -
M
notepadPlus.8.sln -
M
notepadPlus.9.sln -
M
scintilla/src/precompiled_headers.h -
M
scintilla/vcbuild/SciLexer.8.vcproj -
M
scintilla/vcbuild/SciLexer.9.vcproj -
M
scintilla/win32/ScintillaWin.cxx