Merge branch 'kernelshark-devel' into trace-cmd

Conflicts:
	Makefile

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

1 files changed, 6 insertions, 0 deletions

diff --git a/trace-view.h b/trace-view.h
index 182b285..81dac6f 100644
--- a/trace-view.h
+++ b/trace-view.h
@@ -23,6 +23,7 @@
 
 #include "trace-view-store.h"
 #include "trace-filter.h"
+#include "trace-xml.h"
 
 void
 trace_view_load(GtkWidget *view, struct tracecmd_input *handle,
@@ -65,4 +66,9 @@ void trace_view_search_setup(GtkBox *box, GtkTreeView *treeview);
 
 gint trace_view_get_selected_row(GtkWidget *treeview);
 
+int trace_view_save_filters(struct tracecmd_xml_handle *handle,
+                            GtkTreeView *treeview);
+int trace_view_load_filters(struct tracecmd_xml_handle *handle,
+                            GtkTreeView *treeview);
+
 #endif /* _TRACE_VIEW_H */