Changeset [93c5838e1d3e0188705a1d8f21d20d528cd1465b] by Jocelyn Legault
Revision 93c5838e1d3e0188705a1d8f21d20d528cd1465b,
committed by Jocelyn Legault
· October 3rd, 2010 @ 04:21 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[NEW_BEHAVIOUR] File detection : Switch to modified or deleted file while user is asked to reload or keep the file.
Conflicts:
PowerEditor/src/Notepad_plus.cpp
[#45]
Signed-off-by: Jocelyn Legault
jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/93c5838e1d3e0188705a1d8...
3 changed files
-
M
PowerEditor/src/Notepad_plus.cpp -
M
PowerEditor/src/Notepad_plus.h -
M
PowerEditor/src/ScintillaComponent/Buffer.cpp