Revision 152ab4d0 - Merge remote-tracking branch 'mainline/master' into inc Conflicts: e... - pfSense - pfSense bugtracker

« Previous | Next »

Revision 152ab4d0

Added by Vinicius Coque over 14 years ago

ID 152ab4d0c036889d5d983cef0f612c2dcf211e7b
Parent 54bdff75, d93ee937
Child bca0472d

Merge remote-tracking branch 'mainline/master' into inc

Conflicts:
etc/inc/interfaces.inc
etc/inc/priv.defs.inc
etc/inc/shaper.inc
etc/inc/system.inc

Changes

added
modified
copied
renamed
deleted