Changeset [01fa1942e9ce3ee307f9c5a8cfcdc6f766d9d217] by Jocelyn Legault
Revision 01fa1942e9ce3ee307f9c5a8cfcdc6f766d9d217,
committed by Jocelyn Legault
· December 17th, 2009 @ 01:27 AM
Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW_FEATURE] Add auto-detection of HTML/XML file encoding.
Conflicts:
PowerEditor/src/Notepad_plus.h
PowerEditor/src/Parameters.cpp
PowerEditor/src/ScitillaComponent/Buffer.cpp
[#29]
Signed-off-by: Jocelyn Legault
jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/01fa1942e9ce3ee307f9c5a...
7 changed files
-
M
PowerEditor/bin/change.log -
M
PowerEditor/src/Notepad_plus.cpp -
M
PowerEditor/src/Notepad_plus.h -
M
PowerEditor/src/Parameters.cpp -
M
PowerEditor/src/Parameters.h -
M
PowerEditor/src/ScitillaComponent/Buffer.cpp -
M
PowerEditor/src/ScitillaComponent/Buffer.h