Changeset [d55475a895116e133fd55cc4bec0d78adcfe1aa6] by Jocelyn Legault
Revision d55475a895116e133fd55cc4bec0d78adcfe1aa6,
committed by Jocelyn Legault
· September 25th, 2010 @ 05:19 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[UPDATE] Refactor Notepad_plus.cpp (in progress).
Conflicts:
PowerEditor/src/Notepad_plus.cpp
PowerEditor/src/Notepad_plus.h
PowerEditor/src/NppCommands.cpp
PowerEditor/src/WinControls/TaskList/TaskListDlg.h
PowerEditor/visual.net/notepadPlus.vcproj
[#45]
Signed-off-by: Jocelyn Legault
jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/d55475a895116e133fd55cc...
4 changed files
-
M
PowerEditor/src/MISC/Common/Common.h -
M
PowerEditor/src/Notepad_plus.cpp -
M
PowerEditor/src/Notepad_plus.h -
M
PowerEditor/src/WinControls/TaskList/TaskListDlg.h