Changeset [f7678dbdc8b810f57bdf60e5b7b8cf0f226a17cf] by Jocelyn Legault
Revision f7678dbdc8b810f57bdf60e5b7b8cf0f226a17cf,
committed by Jocelyn Legault
· September 23rd, 2010 @ 05:01 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[#45]
Conflicts:
PowerEditor/src/ScitillaComponent/ScintillaEditView.h
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/f7678dbdc8b810f57bdf60e...
9 changed files
-
M
PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h -
M
PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp -
M
PowerEditor/src/Notepad_plus.cpp -
M
PowerEditor/src/Notepad_plus.rc -
M
PowerEditor/src/Parameters.cpp -
M
PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp -
M
PowerEditor/src/ScintillaComponent/xmlMatchedTagsHighlighter.cpp -
M
PowerEditor/src/langs.model.xml -
M
PowerEditor/src/menuCmdID.h