Changeset [2bd1d9b45fc8f1868e6038fece334e5fcc136182] by Thell Fowler

Revision 2bd1d9b45fc8f1868e6038fece334e5fcc136182, committed by Thell Fowler · October 31st, 2010 @ 09:17 PM

Merge branch 'tf/LH-40v2/introduce-funcguard-powershell-module'

tf/LH-40v2/introduce-funcguard-powershell-module: [contrib]: introduce PowerShell FuncGuard module 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

Conflicts:

scintilla/vcbuild/SciLexer.8.vcproj

A contrib/FuncGuard-PowerShell-Module/FuncGuard/FuncGuard-Setup.ps1
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/ModuleWriteError/FunctionInfo.types.ps1xml
A contrib/FuncGuard-PowerShell-Module/ModuleWriteError/ModuleWriteError.demo.psm1
A contrib/FuncGuard-PowerShell-Module/ModuleWriteError/ModuleWriteError.psd1
A contrib/FuncGuard-PowerShell-Module/ModuleWriteError/ModuleWriteError.psm1
A contrib/FuncGuard-PowerShell-Module/N++CR FuncGuards.lnk
A contrib/FuncGuard-PowerShell-Module/README
M scintilla/vcbuild/SciLexer.8.vcproj