Changeset [f95e70a76db4ee183dbf32d314cbfe30db5a117b] by Jocelyn Legault
Revision f95e70a76db4ee183dbf32d314cbfe30db5a117b,
committed by Jocelyn Legault
· December 16th, 2009 @ 10:28 PM
Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW_FEATURE] Add Marker Jumper feature.
Conflicts:
PowerEditor/src/Notepad_plus.cpp
PowerEditor/src/Notepad_plus.h
PowerEditor/src/Notepad_plus.rc
PowerEditor/src/menuCmdID.h
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/f95e70a76db4ee183dbf32d...
10 changed files
-
M
PowerEditor/src/Notepad_plus.cpp -
M
PowerEditor/src/Notepad_plus.h -
M
PowerEditor/src/Notepad_plus.rc -
M
PowerEditor/src/Parameters.cpp -
M
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp -
M
PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp -
M
PowerEditor/src/ScitillaComponent/SmartHighlighter.cpp -
M
PowerEditor/src/menuCmdID.h -
M
PowerEditor/src/resource.h -
M
scintilla/include/SciLexer.h