Changeset [3d12e0f0684d8b0c5add2eb5ce6c59441ec5b9e8] by Jocelyn Legault
Revision 3d12e0f0684d8b0c5add2eb5ce6c59441ec5b9e8,
committed by Jocelyn Legault
· October 3rd, 2010 @ 04:21 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[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/npp-community/npp-community/commit/3d12e0f0684d8b...
3 changed files
-
M
PowerEditor/src/Notepad_plus.cpp -
M
PowerEditor/src/Notepad_plus.h -
M
PowerEditor/src/ScintillaComponent/Buffer.cpp