[network-manager-applet: 5/5] merge: add DCB configuration UI (bgo #711032) (rh #1068688)

[Dan Williams <dcbw src gnome org>]

commit 18cd89d6287a7329c658f3b8da15ab7afd87d53a
Merge: 0a3ec42 51448ec
Author: Dan Williams <dcbw redhat com>
Date:   Fri Feb 21 10:57:10 2014 -0600

    merge: add DCB configuration UI (bgo #711032) (rh #1068688)
    
    Add DCB configuration page to nm-connection-editor.

 src/connection-editor/Makefile.am            |    5 +-
 src/connection-editor/ce-page-dcb.ui         | 3161 ++++++++++++++++++++++++++
 src/connection-editor/ce-page.c              |   25 +-
 src/connection-editor/ce-page.h              |    4 +-
 src/connection-editor/nm-connection-editor.c |    6 +
 src/connection-editor/page-dcb.c             |  780 +++++++
 src/connection-editor/page-dcb.h             |   59 +
 src/connection-editor/page-ethernet.c        |    2 +-
 src/connection-editor/page-infiniband.c      |    2 +-
 src/connection-editor/page-vlan.c            |    2 +-
 src/connection-editor/page-wifi.c            |    6 +-
 11 files changed, 4040 insertions(+), 12 deletions(-)
---