Changeset [6752c91e05bfc4604294f9aa22c2d81722a0798a] by Jocelyn Legault
Revision 6752c91e05bfc4604294f9aa22c2d81722a0798a,
committed by Jocelyn Legault
· December 14th, 2009 @ 11:17 PM
Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
Conflicts:
PowerEditor/src/Notepad_plus.cpp
PowerEditor/src/Notepad_plus.rc
[#29]
Signed-off-by: Jocelyn Legault
jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/6752c91e05bfc4604294f9a...
5 changed files
-
M
PowerEditor/src/Notepad_plus.cpp -
M
PowerEditor/src/Notepad_plus.h -
M
PowerEditor/src/Parameters.cpp -
M
PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp -
M
PowerEditor/src/icons/chameleon.ico