Changeset [a8f0650cece6f2e7a23b360baee1461e908ff3d1] by Thell Fowler
Revision a8f0650cece6f2e7a23b360baee1461e908ff3d1,
committed by Thell Fowler
· February 27th, 2010 @ 04:30 PM
Merge branch 'tf/LH-32v8/introduce-funcguard-category-setup' into pu
-
tf/LH-32v8/introduce-funcguard-category-setup: funcguard: add Scintilla DllMain guard funcguard: add PowerEditor WinMain.cpp guards scintilla: add funcguard category setup common: make npp_debug common and add to Scintilla powereditor: introduce funcguard category setup
-
32v8 differs from v7 in that it was rebased onto 59a5f36
Conflicts:
scintilla/src/precompiled_headers.h
[#32]
Signed-off-by: Thell Fowler git@tbfowler.name
http://github.com/npp-community/npp-community/commit/a8f0650cece6f2...
23 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
scintilla/src/precompiled_headers.h -
M
scintilla/vcbuild/SciLexer.8.vcproj -
M
scintilla/vcbuild/SciLexer.9.vcproj -
M
scintilla/win32/ScintillaWin.cxx