Changeset [1bf149945b7738ac372fe5d74f0a230b3823a6b2] by Jocelyn Legault

Revision 1bf149945b7738ac372fe5d74f0a230b3823a6b2, committed by Jocelyn Legault · October 3rd, 2010 @ 03:53 AM

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

[UPDATE] (Author: Sin Thesis) Refactoring (in progress).

Conflicts:

PowerEditor/src/Notepad_plus.cpp
PowerEditor/src/Notepad_plus.h
PowerEditor/src/NppBigSwitch.cpp
PowerEditor/src/NppCommands.cpp
PowerEditor/src/NppIO.cpp
PowerEditor/src/NppNotification.cpp
PowerEditor/src/WinControls/shortcut/shortcut.cpp
PowerEditor/src/winmain.cpp

[#45]

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

14 changed files

A PowerEditor/src/Notepad_plus_Window.cpp
A PowerEditor/src/Notepad_plus_Window.h
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/NppIO.cpp
M PowerEditor/src/NppNotification.cpp
M PowerEditor/src/ScintillaComponent/Buffer.h
M PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
M PowerEditor/src/WinControls/shortcut/shortcut.cpp
M PowerEditor/src/winmain.cpp
M PowerEditor/visual.net/notepadPlus.9.vcproj
M PowerEditor/visual.net/notepadPlus.vcproj