Changeset [7a7e9ef7e562373506f39df4d6d2aade7d9db3ee] by Jocelyn Legault
Revision 7a7e9ef7e562373506f39df4d6d2aade7d9db3ee,
committed by Jocelyn Legault
· December 14th, 2009 @ 10:55 PM
Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
Conflicts:
PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp
PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.h
[#29]
Signed-off-by: Jocelyn Legault
jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/7a7e9ef7e562373506f39df...
2 changed files
-
M
PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp -
M
PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.h