Changeset [0e13ab681abca05c899550e9748712f7906831b0] by Jocelyn Legault
Revision 0e13ab681abca05c899550e9748712f7906831b0,
committed by Jocelyn Legault
· September 30th, 2010 @ 02:56 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[RELEASE] Notepad++ v5.6.7 release.
Conflicts:
PowerEditor/src/Notepad_plus.cpp
PowerEditor/src/NppNotification.cpp
[#45]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/0e13ab681abca05c899550e...
11 changed files
-
M
PowerEditor/bin/change.log -
M
PowerEditor/installer/nativeLang/brazilian_portuguese.xml -
M
PowerEditor/installer/nativeLang/italian.xml -
M
PowerEditor/installer/nativeLang/norwegian.xml -
M
PowerEditor/installer/nppSetup.nsi -
M
PowerEditor/src/MISC/Common/Common.cpp -
M
PowerEditor/src/Notepad_plus.cpp -
M
PowerEditor/src/Notepad_plus.h -
M
PowerEditor/src/NppNotification.cpp -
M
PowerEditor/src/resource.h -
M
PowerEditor/src/stylers.model.xml