Changeset [49d8ce5b11d2366f27fc99976bf339bea808cea2] by Jocelyn Legault
Revision 49d8ce5b11d2366f27fc99976bf339bea808cea2,
committed by Jocelyn Legault
· December 17th, 2009 @ 12:32 AM
Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW] Add new encodings.
Conflicts:
PowerEditor/src/Notepad_plus.cpp
PowerEditor/src/Parameters.cpp
PowerEditor/src/Parameters.h
PowerEditor/visual.net/notepadPlus.vcproj
[#29]
Signed-off-by: Jocelyn Legault
jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/49d8ce5b11d2366f27fc999...
30 changed files
-
A
PowerEditor/misc/npp.help/HTML/Images/Screenshots/systemtray.png -
A
PowerEditor/misc/npp.help/HTML/Selecting.html -
A
PowerEditor/misc/npp.help/HTML/System Tray.html -
R
PowerEditor/src/font/LINEDRAW.TTF -
M
PowerEditor/bin/NppHelp.chm -
M
PowerEditor/bin/change.log -
M
PowerEditor/installer/nppSetup.nsi -
M
PowerEditor/misc/npp.help/HTML/Built-in Languages.html -
M
PowerEditor/misc/npp.help/HTML/Command Line.html -
M
PowerEditor/misc/npp.help/HTML/Display.html -
M
PowerEditor/misc/npp.help/HTML/Encoding.html -
M
PowerEditor/misc/npp.help/HTML/Feature Requests.html -
M
PowerEditor/misc/npp.help/HTML/Images/Screenshots/srwindow.png -
M
PowerEditor/misc/npp.help/HTML/Marking search results.html -
M
PowerEditor/misc/npp.help/HTML/Opening and Saving.html -
M
PowerEditor/misc/npp.help/HTML/Preferences.html -
M
PowerEditor/misc/npp.help/HTML/Search window.html -
M
PowerEditor/misc/npp.help/HTML/Shell Extension.html -
M
PowerEditor/misc/npp.help/HTML/Status Bar.html -
M
PowerEditor/misc/npp.help/HTML/Tab Bar.html -
M
PowerEditor/misc/npp.help/Notepad++Help.hhp -
M
PowerEditor/misc/npp.help/Table of Contents.hhc -
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/Parameters.h -
M
PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp -
M
PowerEditor/src/menuCmdID.h -
M
PowerEditor/src/resource.h