Changeset [9ed37f1a2f95bfd3cffb17c463acdae6a7f91a0e] by Thell Fowler
Revision 9ed37f1a2f95bfd3cffb17c463acdae6a7f91a0e,
committed by Thell Fowler
· December 21st, 2009 @ 10:57 PM
Merge branch 'jl/LH-18v3/context-menu-on-tabs' into pu
- jl/LH-18v3/context-menu-on-tabs: Explorer menu variables: rename to clearer names. Explorer Context menu: add contextual menus on tabs.
Conflicts:
PowerEditor/src/Notepad_plus.cpp
PowerEditor/src/Parameters.h
PowerEditor/src/menuCmdID.h
PowerEditor/visual.net/notepadPlus.8.vcproj
PowerEditor/visual.net/notepadPlus.9.vcproj
[#18]
Signed-off-by: Thell Fowler git@tbfowler.name
http://github.com/almostautomated/npp-community/commit/9ed37f1a2f95...
14 changed files
-
A
PowerEditor/src/WinControls/ContextMenu/ExplorerContextMenu.cpp -
A
PowerEditor/src/WinControls/ContextMenu/ExplorerContextMenu.h -
M
PowerEditor/src/Notepad_plus.cpp -
M
PowerEditor/src/Notepad_plus.h -
M
PowerEditor/src/Parameters.cpp -
M
PowerEditor/src/Parameters.h -
M
PowerEditor/src/WinControls/ContextMenu/ContextMenu.cpp -
M
PowerEditor/src/WinControls/ContextMenu/ContextMenu.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 -
M
PowerEditor/visual.net/notepadPlus.8.vcproj -
M
PowerEditor/visual.net/notepadPlus.9.vcproj