---
- branch: MAIN
  date: Fri Jan 22 23:27:12 UTC 2016
  files:
  - new: '1.85'
    old: '1.84'
    path: src/sys/net/if_stf.c
    pathrev: src/sys/net/if_stf.c@1.85
    type: modified
  - new: '1.71'
    old: '1.70'
    path: src/sys/netinet/in_gif.c
    pathrev: src/sys/netinet/in_gif.c@1.71
    type: modified
  - new: '1.50'
    old: '1.49'
    path: src/sys/netinet/ip_encap.c
    pathrev: src/sys/netinet/ip_encap.c@1.50
    type: modified
  - new: '1.15'
    old: '1.14'
    path: src/sys/netinet/ip_encap.h
    pathrev: src/sys/netinet/ip_encap.h@1.15
    type: modified
  - new: '1.136'
    old: '1.135'
    path: src/sys/netinet/ip_mroute.c
    pathrev: src/sys/netinet/ip_mroute.c@1.136
    type: modified
  - new: '1.68'
    old: '1.67'
    path: src/sys/netinet6/in6_gif.c
    pathrev: src/sys/netinet6/in6_gif.c@1.68
    type: modified
  - new: '1.35'
    old: '1.34'
    path: src/sys/netipsec/xform_ipip.c
    pathrev: src/sys/netipsec/xform_ipip.c@1.35
    type: modified
  id: 20160122T232712Z.b4d47fb4ea0b8bf0d399568f31fe0cd92e336829
  log: |
    Back out previous change to introduce struct encapsw.

    This change was intended, but Nakahara-san had already made a better
    one locally!  So I'll let him commit that one, and I'll try not to
    step on anyone's toes again.
  module: src
  subject: 'CVS commit: src/sys'
  unixtime: '1453505232'
  user: riastradh