Changeset [1c9ee2e252c96524b44eda61f1a859d6dd076021] by Jocelyn Legault
Revision 1c9ee2e252c96524b44eda61f1a859d6dd076021,
committed by Jocelyn Legault
· October 7th, 2010 @ 05:21 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[UPDATE] Update the readmeFirst.txt for the build information.
Conflicts:
PowerEditor/src/MISC/Common/Common.h
PowerEditor/src/ScintillaComponent/Printer.h
[#45]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/1c9ee2e252c96524b44eda6...
6 changed files
-
R
PowerEditor/visual.net/notepadPlus.vcproj -
M
PowerEditor/readmeFirst.txt -
M
PowerEditor/src/MISC/Common/Common.cpp -
M
PowerEditor/src/MISC/Common/Common.h -
M
PowerEditor/src/MISC/Process/Process.cpp -
M
PowerEditor/src/WinControls/ColourPicker/ColourPicker.cpp