aboutsummaryrefslogtreecommitdiffstats
path: root/merge.h
diff options
context:
space:
mode:
authorBalint Reczey <balint.reczey@ericsson.com>2011-06-04 21:20:57 +0000
committerBalint Reczey <balint.reczey@ericsson.com>2011-06-04 21:20:57 +0000
commit311f9acfd5b610444e5545db929ae630789b7be6 (patch)
tree288c6a74a60c7922ee79c506c3c538252db894c2 /merge.h
parent7b75e667749ef166a0190f8ddb376ffec6c61d96 (diff)
Fix wiretap headers to allow error-free ABI dumping.
svn path=/trunk/; revision=37543
Diffstat (limited to 'merge.h')
0 files changed, 0 insertions, 0 deletions