Changeset [7328c6d5ad6dd5975cded9c4d2ad0ef1d2bfcb1c] by Jocelyn Legault
January 19th, 2010 @ 07:07 PM
Merge branch 'master' into jl/LH-23/RoxyScroll
Conflicts:
PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
PowerEditor/src/WinControls/Preference/preference.rc
PowerEditor/src/WinControls/Preference/preference_rc.h
PowerEditor/src/menuCmdID.h
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/7328c6d5ad6dd5975cded9c...
Committed by Jocelyn Legault
- A PowerEditor/bin/themes/Bespin.xml
- A PowerEditor/bin/themes/Black board.xml
- A PowerEditor/bin/themes/Choco.xml
- A PowerEditor/bin/themes/Deep Black.xml
- A PowerEditor/bin/themes/Hello Kitty.xml
- A PowerEditor/bin/themes/Mono Industrial.xml
- A PowerEditor/bin/themes/Monokai.xml
- A PowerEditor/bin/themes/Obsidian.xml
- A PowerEditor/bin/themes/Plastic Code Wrap.xml
- A PowerEditor/bin/themes/Ruby Blue.xml
- A PowerEditor/bin/themes/Twilight.xml
- A PowerEditor/bin/themes/Vibrant Ink.xml
- A PowerEditor/bin/themes/Zenburn.xml
- A PowerEditor/bin/themes/vim Dark Blue.xml
- A PowerEditor/installer/nativeLang/kyrgyz.xml
- A PowerEditor/installer/nativeLang/macedonian.xml
- A PowerEditor/misc/npp.help/HTML/Images/Screenshots/systemtray.png
- A PowerEditor/misc/npp.help/HTML/Selecting.html
- A PowerEditor/misc/npp.help/HTML/System Tray.html
- A PowerEditor/misc/npp.help/HTML/Upgrading.html
- A PowerEditor/src/EncodingMapper.cpp
- A PowerEditor/src/EncodingMapper.h
- A PowerEditor/src/ScintillaComponent/AutoCompletion.cpp
- A PowerEditor/src/ScintillaComponent/AutoCompletion.h
- A PowerEditor/src/ScintillaComponent/Buffer.cpp
- A PowerEditor/src/ScintillaComponent/Buffer.h
- A PowerEditor/src/ScintillaComponent/BufferID.h
- A PowerEditor/src/ScintillaComponent/DocTabView.cpp
- A PowerEditor/src/ScintillaComponent/DocTabView.h
- A PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
- A PowerEditor/src/ScintillaComponent/FindReplaceDlg.h
- A PowerEditor/src/ScintillaComponent/FindReplaceDlg.rc
- A PowerEditor/src/ScintillaComponent/FindReplaceDlg_rc.h
- A PowerEditor/src/ScintillaComponent/FunctionCallTip.cpp
- A PowerEditor/src/ScintillaComponent/FunctionCallTip.h
- A PowerEditor/src/ScintillaComponent/GoToLineDlg.cpp
- A PowerEditor/src/ScintillaComponent/GoToLineDlg.h
- A PowerEditor/src/ScintillaComponent/Printer.cpp
- A PowerEditor/src/ScintillaComponent/Printer.h
- A PowerEditor/src/ScintillaComponent/ScintillaCtrls.cpp
- A PowerEditor/src/ScintillaComponent/ScintillaCtrls.h
- A PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
- A PowerEditor/src/ScintillaComponent/ScintillaEditView.h
- A PowerEditor/src/ScintillaComponent/ScintillaRef.h
- A PowerEditor/src/ScintillaComponent/SmartHighlighter.cpp
- A PowerEditor/src/ScintillaComponent/SmartHighlighter.h
- A PowerEditor/src/ScintillaComponent/UserDefineDialog.cpp
- A PowerEditor/src/ScintillaComponent/UserDefineDialog.h
- A PowerEditor/src/ScintillaComponent/UserDefineDialog.rc
- A PowerEditor/src/ScintillaComponent/UserDefineLangReference.h
- A PowerEditor/src/ScintillaComponent/UserDefineResource.h
- A PowerEditor/src/ScintillaComponent/colors.h
- A PowerEditor/src/ScintillaComponent/columnEditor.cpp
- A PowerEditor/src/ScintillaComponent/columnEditor.h
- A PowerEditor/src/ScintillaComponent/columnEditor.rc
- A PowerEditor/src/ScintillaComponent/columnEditor_rc.h
- A PowerEditor/src/ScintillaComponent/xmlMatchedTagsHighlighter.cpp
- A PowerEditor/src/ScintillaComponent/xmlMatchedTagsHighlighter.h
- A PowerEditor/src/icons/chameleon.ico
- A PowerEditor/src/tools/NppShell/codeblocks/NppShell.cbp
- A PowerEditor/src/tools/NppShell/project/NppShell.sln
- A PowerEditor/src/tools/NppShell/project/NppShell.vcproj
- A PowerEditor/src/tools/NppShell/src/NppShell.cpp
- A PowerEditor/src/tools/NppShell/src/NppShell.h
- A PowerEditor/src/tools/NppShell/src/NppShell.rc
- A PowerEditor/src/tools/NppShell/src/bitmap/npp.bmp
- A PowerEditor/src/tools/NppShell/src/export.def
- A PowerEditor/src/tools/NppShell/src/icon/npp_0.ico
- A PowerEditor/src/tools/NppShell/src/icon/npp_1.ico
- A PowerEditor/src/tools/NppShell/src/resource.h
- R PowerEditor/src/ScitillaComponent/AutoCompletion.cpp
- R PowerEditor/src/ScitillaComponent/AutoCompletion.h
- R PowerEditor/src/ScitillaComponent/Buffer.cpp
- R PowerEditor/src/ScitillaComponent/Buffer.h
- R PowerEditor/src/ScitillaComponent/BufferID.h
- R PowerEditor/src/ScitillaComponent/DocTabView.cpp
- R PowerEditor/src/ScitillaComponent/DocTabView.h
- R PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
- R PowerEditor/src/ScitillaComponent/FindReplaceDlg.h
- R PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc
- R PowerEditor/src/ScitillaComponent/FindReplaceDlg_rc.h
- R PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp
- R PowerEditor/src/ScitillaComponent/FunctionCallTip.h
- R PowerEditor/src/ScitillaComponent/GoToLineDlg.cpp
- R PowerEditor/src/ScitillaComponent/GoToLineDlg.h
- R PowerEditor/src/ScitillaComponent/Printer.cpp
- R PowerEditor/src/ScitillaComponent/Printer.h
- R PowerEditor/src/ScitillaComponent/ScintillaCtrls.cpp
- R PowerEditor/src/ScitillaComponent/ScintillaCtrls.h
- R PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
- R PowerEditor/src/ScitillaComponent/ScintillaEditView.h
- R PowerEditor/src/ScitillaComponent/ScintillaRef.h
- R PowerEditor/src/ScitillaComponent/SmartHighlighter.cpp
- R PowerEditor/src/ScitillaComponent/SmartHighlighter.h
- R PowerEditor/src/ScitillaComponent/UserDefineDialog.cpp
- R PowerEditor/src/ScitillaComponent/UserDefineDialog.h
- R PowerEditor/src/ScitillaComponent/UserDefineDialog.rc
- R PowerEditor/src/ScitillaComponent/UserDefineLangReference.h
- R PowerEditor/src/ScitillaComponent/UserDefineResource.h
- R PowerEditor/src/ScitillaComponent/colors.h
- R PowerEditor/src/ScitillaComponent/columnEditor.cpp
- R PowerEditor/src/ScitillaComponent/columnEditor.h
- R PowerEditor/src/ScitillaComponent/columnEditor.rc
- R PowerEditor/src/ScitillaComponent/columnEditor_rc.h
- R PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.cpp
- R PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.h
- R PowerEditor/src/WinControls/DockingWnd/DropData.h
- R PowerEditor/src/WinControls/TreeView/TreeView.cpp
- R PowerEditor/src/WinControls/TreeView/TreeView.h
- R PowerEditor/src/font/LINEDRAW.TTF
- R PowerEditor/src/tools/nppCM/Makefile
- R PowerEditor/src/tools/nppCM/license.txt
- R PowerEditor/src/tools/nppCM/npp.bmp
- R PowerEditor/src/tools/nppCM/nppcm.RES
- R PowerEditor/src/tools/nppCM/nppcm.cpp
- R PowerEditor/src/tools/nppCM/nppcm.def
- R PowerEditor/src/tools/nppCM/nppcm.h
- R PowerEditor/src/tools/nppCM/nppcm.rc
- R PowerEditor/src/tools/nppCM/readme.txt
- R PowerEditor/src/tools/nppCM/resource.h
- M PowerEditor/bin/NppHelp.chm
- M PowerEditor/bin/change.log
- M PowerEditor/installer/nativeLang/afrikaans.xml
- M PowerEditor/installer/nativeLang/albanian.xml
- M PowerEditor/installer/nativeLang/arabic.xml
- M PowerEditor/installer/nativeLang/aranese.xml
- M PowerEditor/installer/nativeLang/basque.xml
- M PowerEditor/installer/nativeLang/belarusian.xml
- M PowerEditor/installer/nativeLang/brazilian_portuguese.xml
- M PowerEditor/installer/nativeLang/bulgarian.xml
- M PowerEditor/installer/nativeLang/catalan.xml
- M PowerEditor/installer/nativeLang/chinese.xml
- M PowerEditor/installer/nativeLang/chineseSimplified.xml
- M PowerEditor/installer/nativeLang/croatian.xml
- M PowerEditor/installer/nativeLang/czech.xml
- M PowerEditor/installer/nativeLang/danish.xml
- M PowerEditor/installer/nativeLang/dutch.xml
- M PowerEditor/installer/nativeLang/english.xml
- M PowerEditor/installer/nativeLang/extremaduran.xml
- M PowerEditor/installer/nativeLang/farsi.xml
- M PowerEditor/installer/nativeLang/finnish.xml
- M PowerEditor/installer/nativeLang/french.xml
- M PowerEditor/installer/nativeLang/friulian.xml
- M PowerEditor/installer/nativeLang/galician.xml
- M PowerEditor/installer/nativeLang/georgian.xml
- M PowerEditor/installer/nativeLang/german.xml
- M PowerEditor/installer/nativeLang/greek.xml
- M PowerEditor/installer/nativeLang/hebrew.xml
- M PowerEditor/installer/nativeLang/hungarian.xml
- M PowerEditor/installer/nativeLang/hungarianA.xml
- M PowerEditor/installer/nativeLang/indonesian.xml
- M PowerEditor/installer/nativeLang/italian.xml
- M PowerEditor/installer/nativeLang/japanese.xml
- M PowerEditor/installer/nativeLang/kazakh.xml
- M PowerEditor/installer/nativeLang/korean.xml
- M PowerEditor/installer/nativeLang/lithuanian.xml
- M PowerEditor/installer/nativeLang/luxembourgish.xml
- M PowerEditor/installer/nativeLang/malay.xml
- M PowerEditor/installer/nativeLang/norwegian.xml
- M PowerEditor/installer/nativeLang/nynorsk.xml
- M PowerEditor/installer/nativeLang/occitan.xml
- M PowerEditor/installer/nativeLang/polish.xml
- M PowerEditor/installer/nativeLang/portuguese.xml
- M PowerEditor/installer/nativeLang/romanian.xml
- M PowerEditor/installer/nativeLang/russian.xml
- M PowerEditor/installer/nativeLang/samogitian.xml
- M PowerEditor/installer/nativeLang/serbian.xml
- M PowerEditor/installer/nativeLang/slovak.xml
- M PowerEditor/installer/nativeLang/slovakA.xml
- M PowerEditor/installer/nativeLang/slovenian.xml
- M PowerEditor/installer/nativeLang/spanish.xml
- M PowerEditor/installer/nativeLang/spanish_ar.xml
- M PowerEditor/installer/nativeLang/swedish.xml
- M PowerEditor/installer/nativeLang/tagalog.xml
- M PowerEditor/installer/nativeLang/thai.xml
- M PowerEditor/installer/nativeLang/turkish.xml
- M PowerEditor/installer/nativeLang/ukrainian.xml
- M PowerEditor/installer/nativeLang/uzbek.xml
- M PowerEditor/installer/nativeLang/uzbekCyrillic.xml
- M PowerEditor/installer/nppSetup.nsi
- M PowerEditor/installer/packageAll.bat
- M PowerEditor/misc/npp.help/HTML/Built-in Languages.html
- M PowerEditor/misc/npp.help/HTML/Command Line.html
- M PowerEditor/misc/npp.help/HTML/Display.html
- M PowerEditor/misc/npp.help/HTML/Dockable Windows.html
- M PowerEditor/misc/npp.help/HTML/Encoding.html
- M PowerEditor/misc/npp.help/HTML/Feature Requests.html
- M PowerEditor/misc/npp.help/HTML/Images/Screenshots/srwindow.png
- M PowerEditor/misc/npp.help/HTML/Marking search results.html
- M PowerEditor/misc/npp.help/HTML/Newline format.html
- M PowerEditor/misc/npp.help/HTML/Opening and Saving.html
- M PowerEditor/misc/npp.help/HTML/Plugins.html
- M PowerEditor/misc/npp.help/HTML/Preferences.html
- M PowerEditor/misc/npp.help/HTML/Search window.html
- M PowerEditor/misc/npp.help/HTML/Shell Extension.html
- M PowerEditor/misc/npp.help/HTML/Status Bar.html
- M PowerEditor/misc/npp.help/HTML/Tab Bar.html
- M PowerEditor/misc/npp.help/HTML/User Defined languages.html
- M PowerEditor/misc/npp.help/Notepad++Help.hhp
- M PowerEditor/misc/npp.help/Table of Contents.hhc
- M PowerEditor/src/MISC/Common/Common.cpp
- M PowerEditor/src/MISC/Common/Common.h
- M PowerEditor/src/MISC/Common/npp_date.cpp
- M PowerEditor/src/MISC/Common/npp_date.h
- M PowerEditor/src/MISC/Common/npp_session.cpp
- M PowerEditor/src/MISC/Common/npp_session.h
- M PowerEditor/src/MISC/Common/npp_styles.cpp
- M PowerEditor/src/MISC/Common/npp_styles.h
- M PowerEditor/src/MISC/Common/npp_winver.cpp
- M PowerEditor/src/MISC/Common/npp_winver.h
- M PowerEditor/src/MISC/Debug/npp_debug.cpp
- M PowerEditor/src/MISC/Debug/npp_debug.h
- M PowerEditor/src/MISC/Exception/MiniDumper.cpp
- M PowerEditor/src/MISC/Exception/MiniDumper.h
- M PowerEditor/src/MISC/Exception/Win32Exception.cpp
- M PowerEditor/src/MISC/Exception/Win32Exception.h
- M PowerEditor/src/MISC/FileNameStringSplitter.h
- M PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
- M PowerEditor/src/MISC/PluginsManager/PluginInterface.h
- M PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
- M PowerEditor/src/MISC/PluginsManager/PluginsManager.h
- M PowerEditor/src/MISC/Process/Process.cpp
- M PowerEditor/src/MISC/Process/Process.h
- M PowerEditor/src/MISC/RegExt/regExtDlg.cpp
- M PowerEditor/src/MISC/RegExt/regExtDlg.h
- M PowerEditor/src/MISC/RegExt/regExtDlgRc.h
- M PowerEditor/src/Notepad_plus.cpp
- M PowerEditor/src/Notepad_plus.h
- M PowerEditor/src/Notepad_plus.rc
- M PowerEditor/src/Parameters.cpp
- M PowerEditor/src/Parameters.h
- M PowerEditor/src/Utf8_16.h
- M PowerEditor/src/ValueDlg.h
- M PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp
- M PowerEditor/src/WinControls/AboutDlg/AboutDlg.h
- M PowerEditor/src/WinControls/AboutDlg/URLCtrl.cpp
- M PowerEditor/src/WinControls/AboutDlg/URLCtrl.h
- M PowerEditor/src/WinControls/ColourPicker/ColourPicker.cpp
- M PowerEditor/src/WinControls/ColourPicker/ColourPicker.h
- M PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp
- M PowerEditor/src/WinControls/ColourPicker/ColourPopup.h
- M PowerEditor/src/WinControls/ColourPicker/ColourPopupResource.h
- M PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp
- M PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h
- M PowerEditor/src/WinControls/ColourPicker/WordStyleDlgRes.h
- M PowerEditor/src/WinControls/ContextMenu/ContextMenu.cpp
- M PowerEditor/src/WinControls/ContextMenu/ContextMenu.h
- M PowerEditor/src/WinControls/DockingWnd/Docking.h
- M PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp
- M PowerEditor/src/WinControls/DockingWnd/DockingCont.h
- M PowerEditor/src/WinControls/DockingWnd/DockingDlgInterface.cpp
- M PowerEditor/src/WinControls/DockingWnd/DockingDlgInterface.h
- M PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp
- M PowerEditor/src/WinControls/DockingWnd/DockingManager.h
- M PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp
- M PowerEditor/src/WinControls/DockingWnd/DockingSplitter.h
- M PowerEditor/src/WinControls/DockingWnd/Gripper.cpp
- M PowerEditor/src/WinControls/DockingWnd/Gripper.h
- M PowerEditor/src/WinControls/DockingWnd/dockingResource.h
- M PowerEditor/src/WinControls/Grid/BabyGrid.cpp
- M PowerEditor/src/WinControls/Grid/BabyGrid.h
- M PowerEditor/src/WinControls/Grid/BabyGridWrapper.cpp
- M PowerEditor/src/WinControls/Grid/BabyGridWrapper.h
- M PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp
- M PowerEditor/src/WinControls/Grid/ShortcutMapper.h
- M PowerEditor/src/WinControls/Grid/ShortcutMapper_rc.h
- M PowerEditor/src/WinControls/ImageListSet/ImageListSet.cpp
- M PowerEditor/src/WinControls/ImageListSet/ImageListSet.h
- M PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp
- M PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.h
- M PowerEditor/src/WinControls/Preference/preference.rc
- M PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
- M PowerEditor/src/WinControls/Preference/preferenceDlg.h
- M PowerEditor/src/WinControls/Preference/preference_rc.h
- M PowerEditor/src/WinControls/SplitterContainer/Splitter.cpp
- M PowerEditor/src/WinControls/SplitterContainer/Splitter.h
- M PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp
- M PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.h
- M PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp
- M PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.h
- M PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp
- M PowerEditor/src/WinControls/StaticDialog/StaticDialog.h
- M PowerEditor/src/WinControls/StatusBar/StatusBar.cpp
- M PowerEditor/src/WinControls/StatusBar/StatusBar.h
- M PowerEditor/src/WinControls/TabBar/ControlsTab.cpp
- M PowerEditor/src/WinControls/TabBar/ControlsTab.h
- M PowerEditor/src/WinControls/TabBar/TabBar.cpp
- M PowerEditor/src/WinControls/TabBar/TabBar.h
- M PowerEditor/src/WinControls/TaskList/TaskList.cpp
- M PowerEditor/src/WinControls/TaskList/TaskList.h
- M PowerEditor/src/WinControls/TaskList/TaskListDlg.cpp
- M PowerEditor/src/WinControls/TaskList/TaskListDlg.h
- M PowerEditor/src/WinControls/TaskList/TaskListDlg_rc.h
- M PowerEditor/src/WinControls/ToolBar/ToolBar.cpp
- M PowerEditor/src/WinControls/ToolBar/ToolBar.h
- M PowerEditor/src/WinControls/ToolTip/ToolTip.cpp
- M PowerEditor/src/WinControls/ToolTip/ToolTip.h
- M PowerEditor/src/WinControls/TrayIcon/trayIconControler.cpp
- M PowerEditor/src/WinControls/TrayIcon/trayIconControler.h
- M PowerEditor/src/WinControls/Window.h
- M PowerEditor/src/WinControls/WindowInterface.h
- M PowerEditor/src/WinControls/WindowsDlg/SizeableDlg.cpp
- M PowerEditor/src/WinControls/WindowsDlg/SizeableDlg.h
- M PowerEditor/src/WinControls/WindowsDlg/WinMgr.cpp
- M PowerEditor/src/WinControls/WindowsDlg/WinMgr.h
- M PowerEditor/src/WinControls/WindowsDlg/WinRect.cpp
- M PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp
- M PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.h
- M PowerEditor/src/WinControls/WindowsDlg/WindowsDlgRc.h
- M PowerEditor/src/WinControls/shortcut/RunMacroDlg.cpp
- M PowerEditor/src/WinControls/shortcut/RunMacroDlg.h
- M PowerEditor/src/WinControls/shortcut/RunMacroDlg_rc.h
- M PowerEditor/src/WinControls/shortcut/shortcut.cpp
- M PowerEditor/src/WinControls/shortcut/shortcut.h
- M PowerEditor/src/langs.model.xml
- M PowerEditor/src/lastRecentFileList.cpp
- M PowerEditor/src/localizationString.h
- M PowerEditor/src/menuCmdID.h
- M PowerEditor/src/precompiled_headers.h
- M PowerEditor/src/resource.h
- M PowerEditor/src/stylers.model.xml
- M PowerEditor/src/targetver.h
- M PowerEditor/src/winmain.cpp
- M PowerEditor/src/xpm_icons.h
- M PowerEditor/visual.net/notepadPlus.8.vcproj
- M PowerEditor/visual.net/notepadPlus.9.vcproj
- M scintilla/include/SciLexer.h
- M scintilla/src/Document.cxx
- M scintilla/vcbuild/SciLexer.8.vcproj
- M scintilla/vcbuild/SciLexer.9.vcproj
- M scripts/GIT-VS-VERSION-GEN.bat
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
Notepad++ Community Release