Changeset [9e179d41e3349ea46bee2f68926c3f0e0b2531c8] by Thell Fowler
February 2nd, 2010 @ 07:42 PM
Merge branch 'tf/LH-32v2/introduce-funcguard-category-setup' into my_master
- tf/LH-32v2/introduce-funcguard-category-setup: [contrib]: introduce PowerShell FuncGuard module 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
http://github.com/almostautomated/npp-community/commit/9e179d41e334...
Committed by Thell Fowler
- 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 contrib/FuncGuard-PowerShell-Module/FuncGuard/FuncGuard.config.psd1
- A contrib/FuncGuard-PowerShell-Module/FuncGuard/FuncGuard.format.ps1xml
- A contrib/FuncGuard-PowerShell-Module/FuncGuard/FuncGuard.psd1
- A contrib/FuncGuard-PowerShell-Module/FuncGuard/FuncGuard.psm1
- A contrib/FuncGuard-PowerShell-Module/FuncGuard/FuncGuard.test.ps1
- A contrib/FuncGuard-PowerShell-Module/FuncGuard/FuncGuard.types.ps1xml
- A contrib/FuncGuard-PowerShell-Module/FuncGuard/FuncGuardTestStarter.ps1
- A contrib/FuncGuard-PowerShell-Module/FuncGuard/FuncGuards.cpp.orig
- A contrib/FuncGuard-PowerShell-Module/FuncGuard/FuncGuardsImport.h.orig
- A contrib/FuncGuard-PowerShell-Module/FuncGuard/FuncGuards_skel.h.orig
- A contrib/FuncGuard-PowerShell-Module/FuncGuard/LoadModuleConfig.ps1
- A contrib/FuncGuard-PowerShell-Module/README
- 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
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
Notepad++ Community Release