Changeset [adc4b68070aa7623620abad165fc2668543df4a3] by Jocelyn Legault
Revision adc4b68070aa7623620abad165fc2668543df4a3,
committed by Jocelyn Legault
· September 30th, 2010 @ 04:13 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[RELEASE] Notepad++ v5.6.8 release.
Conflicts:
PowerEditor/src/ScintillaComponent/FunctionCallTip.cpp
[#45]
Signed-off-by: Jocelyn Legault
jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/adc4b68070aa7623620abad...
26 changed files
-
A
PowerEditor/misc/npp.help/HTML/Dialog free search.html -
A
PowerEditor/misc/npp.help/HTML/Display Shortcuts.html -
A
PowerEditor/misc/npp.help/HTML/Edit Shortcuts.html -
A
PowerEditor/misc/npp.help/HTML/File Shortcuts.html -
A
PowerEditor/misc/npp.help/HTML/Images/Screenshots/col_edit_after.png -
A
PowerEditor/misc/npp.help/HTML/Images/Screenshots/col_edit_before.png -
A
PowerEditor/misc/npp.help/HTML/Images/Screenshots/contextmenu.png -
A
PowerEditor/misc/npp.help/HTML/Mouse Gestures.html -
A
PowerEditor/misc/npp.help/HTML/Run Shortcuts.html -
A
PowerEditor/misc/npp.help/HTML/Search Shortcuts.html -
R
PowerEditor/misc/npp.help/HTML/Continued search.html -
R
PowerEditor/misc/npp.help/HTML/Volatile Search.html -
M
PowerEditor/bin/NppHelp.chm -
M
PowerEditor/bin/change.log -
M
PowerEditor/installer/APIs/sql.xml -
M
PowerEditor/installer/nativeLang/czech.xml -
M
PowerEditor/installer/nativeLang/russian.xml -
M
PowerEditor/installer/nppSetup.nsi -
M
PowerEditor/misc/npp.help/HTML/Images/Screenshots/autocomp.png -
M
PowerEditor/misc/npp.help/HTML/Images/Screenshots/docswitch.png -
M
PowerEditor/misc/npp.help/HTML/Images/Screenshots/fif_result.png -
M
PowerEditor/misc/npp.help/HTML/Images/Screenshots/main.png -
M
PowerEditor/misc/npp.help/HTML/Images/Screenshots/srwindow.png -
M
PowerEditor/misc/npp.help/HTML/Images/Screenshots/systemtray.png -
M
PowerEditor/misc/npp.help/Index.hhk -
M
PowerEditor/src/resource.h