Changeset [9bab84c24673f1f76706795b9714b14316e1f2c0] by Jocelyn Legault
Revision 9bab84c24673f1f76706795b9714b14316e1f2c0,
committed by Jocelyn Legault
· October 14th, 2010 @ 04:35 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[NEW] (Author: Dave Brotherstone) Add NPPM_ALLOCATEMARKER plugin message. [NEW_FEATURE] Add Statistics feature which is accessible from the menu command "Summary..." (under menu "View") and the 2nd zone of statusbar (double click).
Conflicts:
PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
PowerEditor/src/MISC/PluginsManager/PluginsManager.h
PowerEditor/src/Notepad_plus.cpp
PowerEditor/src/NppNotification.cpp
PowerEditor/src/ScintillaComponent/ScintillaEditView.h
[#45]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/9bab84c24673f1f76706795...
16 changed files
-
M
PowerEditor/src/MISC/Common/CommonGenerics.h -
M
PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h -
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.h -
M
PowerEditor/src/Notepad_plus.rc -
M
PowerEditor/src/NppBigSwitch.cpp -
M
PowerEditor/src/NppCommands.cpp -
M
PowerEditor/src/NppIO.cpp -
M
PowerEditor/src/NppNotification.cpp -
M
PowerEditor/src/ScintillaComponent/Buffer.cpp -
M
PowerEditor/src/ScintillaComponent/Buffer.h -
M
PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp -
M
PowerEditor/src/menuCmdID.h -
M
PowerEditor/src/resource.h