Changeset [e60cd5ec965bc243fba29544df52c93bee3b3342] by Jocelyn Legault
October 8th, 2010 @ 03:11 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[NEW_FEATURE]
- Add line wrap methods.
- Make folding margin hidable.
- One set of settings are applied in 2 scintilla controls.
Conflicts:
PowerEditor/src/Notepad_plus.cpp
PowerEditor/src/Notepad_plus.h
PowerEditor/src/NppCommands.cpp
PowerEditor/src/Parameters.h
PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
PowerEditor/src/ScintillaComponent/ScintillaEditView.h
PowerEditor/src/ScitillaComponent/ScintillaRef.h
PowerEditor/src/WinControls/Preference/preference.rc
PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
PowerEditor/src/WinControls/Preference/preferenceDlg.h
PowerEditor/src/WinControls/Preference/preference_rc.h
[#45]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/e60cd5ec965bc243fba2954...
Committed by Jocelyn Legault
- M PowerEditor/src/Notepad_plus.cpp
- M PowerEditor/src/Notepad_plus.h
- M PowerEditor/src/Notepad_plus_Window.cpp
- M PowerEditor/src/NppBigSwitch.cpp
- M PowerEditor/src/NppCommands.cpp
- M PowerEditor/src/Parameters.cpp
- M PowerEditor/src/Parameters.h
- M PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
- M PowerEditor/src/ScintillaComponent/ScintillaEditView.h
- M PowerEditor/src/ScintillaComponent/ScintillaRef.h
- M PowerEditor/src/WinControls/Preference/preference.rc
- M PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
- M PowerEditor/src/WinControls/Preference/preference_rc.h
- M PowerEditor/src/menuCmdID.h
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »
Notepad++ Community Release