Changeset [987dfe253970acf50dff27a39b25f68f66783987] by Jocelyn Legault
Revision 987dfe253970acf50dff27a39b25f68f66783987,
committed by Jocelyn Legault
· October 8th, 2010 @ 03:23 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[BUG_FIXED] Restore zoom settings saving for both scintilla controls.
Conflicts:
PowerEditor/src/Notepad_plus.cpp
PowerEditor/src/NppBigSwitch.cpp
PowerEditor/src/Parameters.h
PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
[#45]
Signed-off-by: Jocelyn Legault
jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/987dfe253970acf50dff27a...
10 changed files
-
M
PowerEditor/bin/readme.txt -
M
PowerEditor/src/Notepad_plus.cpp -
M
PowerEditor/src/Notepad_plus.h -
M
PowerEditor/src/NppBigSwitch.cpp -
M
PowerEditor/src/Parameters.cpp -
M
PowerEditor/src/Parameters.h -
M
PowerEditor/src/Parameters_def.h -
M
PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp -
M
PowerEditor/src/WinControls/Preference/preferenceDlg.cpp -
M
PowerEditor/src/config.model.xml