summaryrefslogtreecommitdiffstats
path: root/staptree.h
diff options
context:
space:
mode:
authorMark Wielaard <mjw@redhat.com>2009-01-23 14:28:47 +0100
committerMark Wielaard <mjw@redhat.com>2009-01-23 14:28:47 +0100
commitc3bad3042df505a3470f1e20b09822a9df1d4761 (patch)
tree6842e8eaa705e406379d34cf07a85431b6d71344 /staptree.h
parent750b1f2f5c84acaf0776de5239dc81e2e95c1dec (diff)
parentf120873cb40cfc16cc94f06fd722abc927b96227 (diff)
downloadsystemtap-steved-c3bad3042df505a3470f1e20b09822a9df1d4761.tar.gz
systemtap-steved-c3bad3042df505a3470f1e20b09822a9df1d4761.tar.xz
systemtap-steved-c3bad3042df505a3470f1e20b09822a9df1d4761.zip
Merge branch 'master' into pr6866.
Diffstat (limited to 'staptree.h')
-rw-r--r--staptree.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/staptree.h b/staptree.h
index 069c9bcc..12d84698 100644
--- a/staptree.h
+++ b/staptree.h
@@ -289,6 +289,7 @@ struct print_format: public expression
conv_string,
conv_char,
conv_memory,
+ conv_memory_hex,
conv_literal,
conv_binary
};