Changeset [b24c9b7a0c0bf81a4352689abd6b9372100f76fd] by Jocelyn Legault
Revision b24c9b7a0c0bf81a4352689abd6b9372100f76fd,
committed by Jocelyn Legault
· October 1st, 2010 @ 04:06 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[UPDATE] refactoring (in progress).
Conflicts:
PowerEditor/src/Notepad_plus.cpp
PowerEditor/src/Notepad_plus.h
PowerEditor/src/NppBigSwitch.cpp
PowerEditor/src/NppCommands.cpp
PowerEditor/src/NppNotification.cpp
PowerEditor/src/localization.cpp
PowerEditor/visual.net/notepadPlus.vcproj
[#45]
Signed-off-by: Jocelyn Legault
jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/b24c9b7a0c0bf81a4352689...
12 changed files
-
A
PowerEditor/src/localization.cpp -
A
PowerEditor/src/localization.h -
A
PowerEditor/visual.net/notepadPlus.vcproj -
R
PowerEditor/src/NppLocalization.cpp -
M
PowerEditor/src/Notepad_plus.cpp -
M
PowerEditor/src/Notepad_plus.h -
M
PowerEditor/src/NppBigSwitch.cpp -
M
PowerEditor/src/NppCommands.cpp -
M
PowerEditor/src/NppNotification.cpp -
M
PowerEditor/src/WinControls/Preference/preferenceDlg.h -
M
PowerEditor/visual.net/notepadPlus.8.vcproj -
M
PowerEditor/visual.net/notepadPlus.9.vcproj