Changeset [d1b03e560499bea7a7e4a60d12583887fe9cb649] by Jocelyn Legault
Revision d1b03e560499bea7a7e4a60d12583887fe9cb649,
committed by Jocelyn Legault
· December 17th, 2009 @ 01:43 AM
Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [RELEASE] Notepad++ v5.6 release.
Conflicts:
PowerEditor/src/MISC/Common/Common.cpp
PowerEditor/src/MISC/Common/Common.h
PowerEditor/src/Notepad_plus.cpp
PowerEditor/src/Parameters.cpp
PowerEditor/src/ScitillaComponent/Buffer.cpp
PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp
PowerEditor/visual.net/notepadPlus.vcproj
[#29]
Signed-off-by: Jocelyn Legault
jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/d1b03e560499bea7a7e4a60...
15 changed files
-
A
PowerEditor/src/EncodingMapper.cpp -
A
PowerEditor/src/EncodingMapper.h -
M
PowerEditor/bin/change.log -
M
PowerEditor/installer/nppSetup.nsi -
M
PowerEditor/installer/packageAll.bat -
M
PowerEditor/src/MISC/Common/Common.cpp -
M
PowerEditor/src/MISC/Common/Common.h -
M
PowerEditor/src/Notepad_plus.cpp -
M
PowerEditor/src/Notepad_plus.rc -
M
PowerEditor/src/Parameters.cpp -
M
PowerEditor/src/ScitillaComponent/Buffer.cpp -
M
PowerEditor/src/ScitillaComponent/Buffer.h -
M
PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp -
M
PowerEditor/src/lastRecentFileList.cpp -
M
PowerEditor/src/menuCmdID.h