aboutsummaryrefslogtreecommitdiffstats
path: root/merge.h
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2012-05-04 21:29:00 +0000
committerBill Meier <wmeier@newsguy.com>2012-05-04 21:29:00 +0000
commitd12d5a606c142c887d966deeca82377b80a4d5e6 (patch)
tree50aa1461f39013b7619462055ece1f9a0f29e179 /merge.h
parent0c1b9e90076234ae88e930fdcefdbe1d7962b210 (diff)
AFAICT sys/types.h & netinet/in.h #includes are not needed for these files.
(Let's see if any of the buildbots give any errors). Also: remove trailing whitespace on lines. svn path=/trunk/; revision=42429
Diffstat (limited to 'merge.h')
0 files changed, 0 insertions, 0 deletions