Merge branch 'master' of git://sources.redhat.com/git/systemtap

Conflicts:

	Makefile.in

1 files changed, 1 insertions, 0 deletions

diff --git a/tapsets.h b/tapsets.h
index 7165244b..406a69d9 100644
--- a/tapsets.h
+++ b/tapsets.h
@@ -17,6 +17,7 @@ struct derived_probe_group;
 
 void register_standard_tapsets(systemtap_session& sess);
 std::vector<derived_probe_group*> all_session_groups(systemtap_session& s);
+int dwfl_report_offline_predicate (const char* modname, const char* filename);
 
 
 #endif // TAPSETS_H