Changeset [24e7fe69118cfcc64842d0480abf4a2b946ea7b6] by Jocelyn Legault
Revision 24e7fe69118cfcc64842d0480abf4a2b946ea7b6,
committed by Jocelyn Legault
· September 21st, 2010 @ 04:38 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
Conflicts:
PowerEditor/src/resource.h
[#45]
Signed-off-by: Jocelyn Legault
jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/24e7fe69118cfcc64842d04...
3 changed files
-
M
PowerEditor/bin/change.log -
M
PowerEditor/installer/nppSetup.nsi -
M
PowerEditor/src/resource.h