Changeset [02b4714e14bb43f63d9a2851c70c8145e8516c84] by Jocelyn Legault

Revision 02b4714e14bb43f63d9a2851c70c8145e8516c84, committed by Jocelyn Legault · September 26th, 2010 @ 05:47 AM

Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7

[OPTIMIZE] (Author : Sune Marcher) Rewrite of menuID2LangType function.

Conflicts:

PowerEditor/src/Notepad_plus.cpp
PowerEditor/src/Parameters.h
PowerEditor/src/ScintillaComponent/AutoCompletion.cpp
PowerEditor/src/ScitillaComponent/ScintillaEditView.h
PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp

[#45]

Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/02b4714e14bb43f63d9a285...

13 changed files

M PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
M PowerEditor/src/Notepad_plus.cpp
M PowerEditor/src/Notepad_plus.rc
M PowerEditor/src/NppCommands.cpp
M PowerEditor/src/NppIO.cpp
M PowerEditor/src/Parameters.cpp
M PowerEditor/src/Parameters.h
M PowerEditor/src/ScintillaComponent/AutoCompletion.cpp
M PowerEditor/src/ScintillaComponent/Buffer.cpp
M PowerEditor/src/ScintillaComponent/Buffer.h
M PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
M PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
M PowerEditor/src/menuCmdID.h