diff options
author | David Smith <dsmith@redhat.com> | 2009-06-16 12:22:32 -0500 |
---|---|---|
committer | David Smith <dsmith@redhat.com> | 2009-06-16 12:22:32 -0500 |
commit | bdbb4549b459294ed9bddb819e5602fb894313f7 (patch) | |
tree | 9d242348f8e2776c0d4841d0586d3b9b8d34ef7c /runtime | |
parent | d05b7a1c363c30c7fcd9d163f457c1ed80d28f19 (diff) | |
parent | 96b190d404d24eb7349adae6e2d57eb5c9f6c26a (diff) | |
download | systemtap-steved-bdbb4549b459294ed9bddb819e5602fb894313f7.tar.gz systemtap-steved-bdbb4549b459294ed9bddb819e5602fb894313f7.tar.xz systemtap-steved-bdbb4549b459294ed9bddb819e5602fb894313f7.zip |
Merge commit 'origin/master' into pr7043
Conflicts:
runtime/transport/transport.c
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/runtime.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/runtime.h b/runtime/runtime.h index 7418d13b..c3bf501d 100644 --- a/runtime/runtime.h +++ b/runtime/runtime.h @@ -96,6 +96,7 @@ static struct #include "copy.c" #include "regs.c" #include "regs-ia64.c" +#include "time.c" #include "task_finder.c" |