Changeset [c14ec64cc2d913c6eda00f59c10be412c63445e9] by Jocelyn Legault
Revision c14ec64cc2d913c6eda00f59c10be412c63445e9,
committed by Jocelyn Legault
· December 17th, 2009 @ 08:36 PM
Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [RELEASE] Notepad++ v5.6.2
Conflicts:
PowerEditor/src/Notepad_plus.cpp
PowerEditor/src/resource.h
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/c14ec64cc2d913c6eda00f5...
19 changed files
-
A
PowerEditor/misc/npp.help/HTML/Upgrading.html -
M
PowerEditor/bin/NppHelp.chm -
M
PowerEditor/bin/change.log -
M
PowerEditor/installer/nativeLang/danish.xml -
M
PowerEditor/installer/nativeLang/finnish.xml -
M
PowerEditor/installer/nativeLang/french.xml -
M
PowerEditor/installer/nativeLang/german.xml -
M
PowerEditor/installer/nativeLang/hungarian.xml -
M
PowerEditor/installer/nativeLang/hungarianA.xml -
M
PowerEditor/installer/nativeLang/italian.xml -
M
PowerEditor/installer/nppSetup.nsi -
M
PowerEditor/misc/npp.help/HTML/Dockable Windows.html -
M
PowerEditor/misc/npp.help/HTML/Plugins.html -
M
PowerEditor/misc/npp.help/HTML/User Defined languages.html -
M
PowerEditor/misc/npp.help/Notepad++Help.hhp -
M
PowerEditor/misc/npp.help/Table of Contents.hhc -
M
PowerEditor/src/Notepad_plus.cpp -
M
PowerEditor/src/menuCmdID.h -
M
PowerEditor/src/resource.h