Changeset [69bd1556237844577dbe46d3013be1882310d93c] by Jocelyn Legault
Revision 69bd1556237844577dbe46d3013be1882310d93c,
committed by Jocelyn Legault
· December 14th, 2009 @ 10:51 PM
Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW_FEATURE] Try to catch plugin crash.
Conflicts:
PowerEditor/src/Notepad_plus.cpp
PowerEditor/src/Notepad_plus.rc
PowerEditor/src/Parameters.cpp
PowerEditor/src/Parameters.h
PowerEditor/src/ScitillaComponent/Buffer.cpp
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
[#29]
Signed-off-by: Jocelyn Legault
jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/69bd1556237844577dbe46d...
11 changed files
-
A
PowerEditor/src/icons/chameleon.ico -
M
PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp -
M
PowerEditor/src/MISC/PluginsManager/PluginsManager.h -
M
PowerEditor/src/Notepad_plus.cpp -
M
PowerEditor/src/Notepad_plus.rc -
M
PowerEditor/src/Parameters.cpp -
M
PowerEditor/src/Parameters.h -
M
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp -
M
PowerEditor/src/ScitillaComponent/FindReplaceDlg.h -
M
PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp -
M
PowerEditor/src/resource.h