Merge branch 'master' of https://github.com/fltk/fltk

1 files changed, 9 insertions, 9 deletions

diff --git a/fluid/makedepend b/fluid/makedepend
index 6eedbd947..88d7b722b 100644
--- a/fluid/makedepend
+++ b/fluid/makedepend
@@ -74,11 +74,11 @@ alignment_panel.o: ../FL/Fl_Scheme.H
 alignment_panel.o: ../FL/Fl_Scheme_Choice.H
 alignment_panel.o: ../FL/Fl_Scrollbar.H
 alignment_panel.o: ../FL/Fl_Shortcut_Button.H
-alignment_panel.o: ../FL/Fl_Simple_Terminal.H
 alignment_panel.o: ../FL/Fl_Slider.H
 alignment_panel.o: ../FL/Fl_Spinner.H
 alignment_panel.o: ../FL/fl_string_functions.h
 alignment_panel.o: ../FL/Fl_Tabs.H
+alignment_panel.o: ../FL/Fl_Terminal.H
 alignment_panel.o: ../FL/Fl_Text_Buffer.H
 alignment_panel.o: ../FL/Fl_Text_Display.H
 alignment_panel.o: ../FL/Fl_Text_Editor.H
@@ -363,10 +363,10 @@ factory.o: ../FL/Fl_Repeat_Button.H
 factory.o: ../FL/Fl_RGB_Image.H
 factory.o: ../FL/Fl_Roller.H
 factory.o: ../FL/Fl_Scrollbar.H
-factory.o: ../FL/Fl_Simple_Terminal.H
 factory.o: ../FL/Fl_Slider.H
 factory.o: ../FL/Fl_Spinner.H
 factory.o: ../FL/Fl_Tabs.H
+factory.o: ../FL/Fl_Terminal.H
 factory.o: ../FL/Fl_Text_Buffer.H
 factory.o: ../FL/Fl_Text_Display.H
 factory.o: ../FL/Fl_Text_Editor.H
@@ -448,11 +448,11 @@ Fd_Snap_Action.o: ../FL/Fl_Scheme.H
 Fd_Snap_Action.o: ../FL/Fl_Scheme_Choice.H
 Fd_Snap_Action.o: ../FL/Fl_Scrollbar.H
 Fd_Snap_Action.o: ../FL/Fl_Shortcut_Button.H
-Fd_Snap_Action.o: ../FL/Fl_Simple_Terminal.H
 Fd_Snap_Action.o: ../FL/Fl_Slider.H
 Fd_Snap_Action.o: ../FL/Fl_Spinner.H
 Fd_Snap_Action.o: ../FL/fl_string_functions.h
 Fd_Snap_Action.o: ../FL/Fl_Tabs.H
+Fd_Snap_Action.o: ../FL/Fl_Terminal.H
 Fd_Snap_Action.o: ../FL/Fl_Text_Buffer.H
 Fd_Snap_Action.o: ../FL/Fl_Text_Display.H
 Fd_Snap_Action.o: ../FL/Fl_Text_Editor.H
@@ -530,11 +530,11 @@ file.o: ../FL/Fl_Scheme_Choice.H
 file.o: ../FL/Fl_Scrollbar.H
 file.o: ../FL/Fl_Shared_Image.H
 file.o: ../FL/Fl_Shortcut_Button.H
-file.o: ../FL/Fl_Simple_Terminal.H
 file.o: ../FL/Fl_Slider.H
 file.o: ../FL/Fl_Spinner.H
 file.o: ../FL/fl_string_functions.h
 file.o: ../FL/Fl_Tabs.H
+file.o: ../FL/Fl_Terminal.H
 file.o: ../FL/Fl_Text_Buffer.H
 file.o: ../FL/Fl_Text_Display.H
 file.o: ../FL/Fl_Text_Editor.H
@@ -623,11 +623,11 @@ fluid.o: ../FL/Fl_Scheme_Choice.H
 fluid.o: ../FL/Fl_Scrollbar.H
 fluid.o: ../FL/Fl_Shared_Image.H
 fluid.o: ../FL/Fl_Shortcut_Button.H
-fluid.o: ../FL/Fl_Simple_Terminal.H
 fluid.o: ../FL/Fl_Slider.H
 fluid.o: ../FL/Fl_Spinner.H
 fluid.o: ../FL/fl_string_functions.h
 fluid.o: ../FL/Fl_Tabs.H
+fluid.o: ../FL/Fl_Terminal.H
 fluid.o: ../FL/Fl_Text_Buffer.H
 fluid.o: ../FL/Fl_Text_Display.H
 fluid.o: ../FL/Fl_Text_Editor.H
@@ -869,6 +869,7 @@ Fl_Function_Type.o: Fl_Window_Type.h
 Fl_Function_Type.o: function_panel.h
 Fl_Function_Type.o: mergeback.h
 Fl_Function_Type.o: StyleParse.h
+Fl_Function_Type.o: undo.h
 Fl_Function_Type.o: widget_browser.h
 Fl_Grid_Type.o: ../config.h
 Fl_Grid_Type.o: ../FL/Enumerations.H
@@ -1149,12 +1150,12 @@ Fl_Widget_Type.o: ../FL/Fl_Scrollbar.H
 Fl_Widget_Type.o: ../FL/Fl_Shared_Image.H
 Fl_Widget_Type.o: ../FL/Fl_Shortcut_Button.H
 Fl_Widget_Type.o: ../FL/fl_show_colormap.H
-Fl_Widget_Type.o: ../FL/Fl_Simple_Terminal.H
 Fl_Widget_Type.o: ../FL/Fl_Slider.H
 Fl_Widget_Type.o: ../FL/Fl_Spinner.H
 Fl_Widget_Type.o: ../FL/fl_string_functions.h
 Fl_Widget_Type.o: ../FL/Fl_Table.H
 Fl_Widget_Type.o: ../FL/Fl_Tabs.H
+Fl_Widget_Type.o: ../FL/Fl_Terminal.H
 Fl_Widget_Type.o: ../FL/Fl_Text_Buffer.H
 Fl_Widget_Type.o: ../FL/Fl_Text_Display.H
 Fl_Widget_Type.o: ../FL/Fl_Text_Editor.H
@@ -1247,11 +1248,11 @@ Fl_Window_Type.o: ../FL/Fl_Scheme_Choice.H
 Fl_Window_Type.o: ../FL/Fl_Scrollbar.H
 Fl_Window_Type.o: ../FL/Fl_Shared_Image.H
 Fl_Window_Type.o: ../FL/Fl_Shortcut_Button.H
-Fl_Window_Type.o: ../FL/Fl_Simple_Terminal.H
 Fl_Window_Type.o: ../FL/Fl_Slider.H
 Fl_Window_Type.o: ../FL/Fl_Spinner.H
 Fl_Window_Type.o: ../FL/fl_string_functions.h
 Fl_Window_Type.o: ../FL/Fl_Tabs.H
+Fl_Window_Type.o: ../FL/Fl_Terminal.H
 Fl_Window_Type.o: ../FL/Fl_Text_Buffer.H
 Fl_Window_Type.o: ../FL/Fl_Text_Display.H
 Fl_Window_Type.o: ../FL/Fl_Text_Editor.H
@@ -1299,7 +1300,6 @@ function_panel.o: ../FL/Fl_Browser_.H
 function_panel.o: ../FL/Fl_Button.H
 function_panel.o: ../FL/Fl_Cairo.H
 function_panel.o: ../FL/fl_casts.H
-function_panel.o: ../FL/Fl_Check_Button.H
 function_panel.o: ../FL/Fl_Choice.H
 function_panel.o: ../FL/fl_config.h
 function_panel.o: ../FL/Fl_Device.H
@@ -1478,11 +1478,11 @@ shell_command.o: ../FL/Fl_Scheme.H
 shell_command.o: ../FL/Fl_Scheme_Choice.H
 shell_command.o: ../FL/Fl_Scrollbar.H
 shell_command.o: ../FL/Fl_Shortcut_Button.H
-shell_command.o: ../FL/Fl_Simple_Terminal.H
 shell_command.o: ../FL/Fl_Slider.H
 shell_command.o: ../FL/Fl_Spinner.H
 shell_command.o: ../FL/fl_string_functions.h
 shell_command.o: ../FL/Fl_Tabs.H
+shell_command.o: ../FL/Fl_Terminal.H
 shell_command.o: ../FL/Fl_Text_Buffer.H
 shell_command.o: ../FL/Fl_Text_Display.H
 shell_command.o: ../FL/Fl_Text_Editor.H