Changeset [d1bf9923614702f8814adb1a95effad254b09233] by Jocelyn Legault
Revision d1bf9923614702f8814adb1a95effad254b09233,
committed by Jocelyn Legault
· December 14th, 2009 @ 08:41 PM
Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
Conflicts:
PowerEditor/src/WinControls/ContextMenu/ContextMenu.h
PowerEditor/src/icons/npp.ico
Signed-off-by: Jocelyn Legault
jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/d1bf9923614702f8814adb1...
5 changed files
-
M
PowerEditor/bin/change.log -
M
PowerEditor/installer/nativeLang/czech.xml -
M
PowerEditor/installer/nppSetup.nsi -
M
PowerEditor/installer/packageAll.bat -
M
PowerEditor/src/WinControls/ContextMenu/ContextMenu.cpp