Changeset [b3b70ff96c9b917c2cf93540d1890c4c10f8f3ef] by Jocelyn Legault
Revision b3b70ff96c9b917c2cf93540d1890c4c10f8f3ef,
committed by Jocelyn Legault
· October 7th, 2010 @ 03:08 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[NEW] Regroup bookmark operation menu commands under "Bookmark" menu folder.
Conflicts:
PowerEditor/src/Notepad_plus.rc
PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp
[#45]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/b3b70ff96c9b91...
18 changed files
-
A
PowerEditor/installer/nativeLang/Latvian.xml -
M
PowerEditor/bin/NppHelp.chm -
M
PowerEditor/bin/change.log -
M
PowerEditor/installer/APIs/php.xml -
M
PowerEditor/installer/nativeLang/czech.xml -
M
PowerEditor/installer/nativeLang/danish.xml -
M
PowerEditor/installer/nativeLang/georgian.xml -
M
PowerEditor/installer/nativeLang/russian.xml -
M
PowerEditor/installer/nppSetup.nsi -
M
PowerEditor/installer/packageAll.bat -
M
PowerEditor/misc/npp.help/HTML/User Defined languages.html -
M
PowerEditor/misc/npp.help/Notepad++Help.hhp -
M
PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp -
M
PowerEditor/src/Notepad_plus.rc -
M
PowerEditor/src/NppCommands.cpp -
M
PowerEditor/src/langs.model.xml -
M
PowerEditor/src/localizationString.h -
M
PowerEditor/src/resource.h