Changeset [742c4794888915968e7eab342b2f80e77f00589e] by Jocelyn Legault
Revision 742c4794888915968e7eab342b2f80e77f00589e,
committed by Jocelyn Legault
· December 16th, 2009 @ 09:51 PM
Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
Conflicts:
PowerEditor/src/resource.h
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/742c4794888915968e7eab3...
5 changed files
-
M
PowerEditor/installer/nppSetup.nsi -
M
PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp -
M
PowerEditor/src/langs.model.xml -
M
PowerEditor/src/resource.h -
M
PowerEditor/src/stylers.model.xml