Changeset [0a042f1767edad65c03f4f1e04c19b286eb10b35] by Jocelyn Legault
Revision 0a042f1767edad65c03f4f1e04c19b286eb10b35,
committed by Jocelyn Legault
· September 24th, 2010 @ 04:30 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[RELEASE] Notepad++ v5.6.6 release.
Conflicts:
PowerEditor/src/resource.h
[#45]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/0a042f1767edad65c03f4f1...
10 changed files
-
A
PowerEditor/bin/doLocalConf.xml -
A
PowerEditor/bin/nppIExplorerShell.exe -
A
PowerEditor/installer/build/dummy -
M
PowerEditor/bin/change.log -
M
PowerEditor/installer/nativeLang/danish.xml -
M
PowerEditor/installer/nativeLang/german.xml -
M
PowerEditor/installer/nativeLang/slovenian.xml -
M
PowerEditor/installer/nppSetup.nsi -
M
PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp -
M
PowerEditor/src/resource.h