diff options
author | Dave Brolley <brolley@redhat.com> | 2009-03-25 11:41:16 -0400 |
---|---|---|
committer | Dave Brolley <brolley@redhat.com> | 2009-03-25 11:41:16 -0400 |
commit | 666d747e2a8880c2906c1e2ead49182cf061df74 (patch) | |
tree | 12ae1700dd11b1ef13415b0349641cfb70e01982 /buildrun.h | |
parent | d171a9ff5fda69cab247d2afd06ec5952941969e (diff) | |
parent | b41a544e20a42413daa0323d2f149e9e34586ccf (diff) | |
download | systemtap-steved-666d747e2a8880c2906c1e2ead49182cf061df74.tar.gz systemtap-steved-666d747e2a8880c2906c1e2ead49182cf061df74.tar.xz systemtap-steved-666d747e2a8880c2906c1e2ead49182cf061df74.zip |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Conflicts:
Makefile.in
Diffstat (limited to 'buildrun.h')
-rw-r--r-- | buildrun.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -14,7 +14,7 @@ int compile_pass (systemtap_session& s); int run_pass (systemtap_session& s); -int make_tracequery(systemtap_session& s, std::string& name); +int make_tracequery(systemtap_session& s, std::string& name, const std::vector<std::string>& extra_headers); #endif // BUILDRUN_H |