Changeset [74241add7f649a98ec0d471b5fd002868e74bc5f] by Jocelyn Legault
Revision 74241add7f649a98ec0d471b5fd002868e74bc5f,
committed by Jocelyn Legault
· October 1st, 2010 @ 04:06 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[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/npp-community/npp-community/commit/74241add7f649a...
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