Changeset [f3b47eb4ca01306b85462f29bd49e3676698f9d4] by Jocelyn Legault
Revision f3b47eb4ca01306b85462f29bd49e3676698f9d4,
committed by Jocelyn Legault
· October 6th, 2010 @ 05:58 AM
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[CLEAN] throw runtime_error instead of int.
Conflicts:
PowerEditor/src/Parameters.cpp
PowerEditor/src/ScintillaComponent/FindReplaceDlg.h
PowerEditor/src/ScintillaComponent/GoToLineDlg.h
PowerEditor/src/ScintillaComponent/columnEditor.h
PowerEditor/src/WinControls/SplitterContainer/Splitter.cpp
[#45]
Signed-off-by: Jocelyn Legault
jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/f3b47eb4ca0130...
24 changed files
-
M
PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp -
M
PowerEditor/src/Notepad_plus_Window.cpp -
M
PowerEditor/src/Parameters.cpp -
M
PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp -
M
PowerEditor/src/ScintillaComponent/GoToLineDlg.cpp -
M
PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp -
M
PowerEditor/src/ScintillaComponent/columnEditor.cpp -
M
PowerEditor/src/WinControls/ColourPicker/ColourPicker.cpp -
M
PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp -
M
PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp -
M
PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp -
M
PowerEditor/src/WinControls/DockingWnd/Gripper.cpp -
M
PowerEditor/src/WinControls/ImageListSet/ImageListSet.cpp -
M
PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp -
M
PowerEditor/src/WinControls/SplitterContainer/Splitter.cpp -
M
PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp -
M
PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp -
M
PowerEditor/src/WinControls/StatusBar/StatusBar.cpp -
M
PowerEditor/src/WinControls/TabBar/TabBar.cpp -
M
PowerEditor/src/WinControls/TaskList/TaskList.cpp -
M
PowerEditor/src/WinControls/ToolBar/ToolBar.cpp -
M
PowerEditor/src/WinControls/ToolTip/ToolTip.cpp -
M
PowerEditor/src/WinControls/Window.h -
M
PowerEditor/src/winmain.cpp