diff options
author | Dan Williams <dcbw@redhat.com> | 2011-01-12 15:46:37 -0600 |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2011-01-12 15:46:37 -0600 |
commit | f9ceafd4a124142617280101eda5464ac67c5e39 (patch) | |
tree | cd336e771bf30ba1ee0347037a7f47095fc04c58 /.gitignore | |
parent | 7de13fa58dca796493b623fcba00d468f3aaa9f6 (diff) | |
parent | 5a35862a1d24fb8d515ea09339123646370c2845 (diff) | |
download | NetworkManager-f9ceafd4a124142617280101eda5464ac67c5e39.tar.gz |
Merge remote branch 'origin/master' into rm-userset
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 848da36b55..b87df2330d 100644 --- a/.gitignore +++ b/.gitignore @@ -59,6 +59,12 @@ docs/generate-settings-spec docs/settings-spec.html docs/spec.html +examples/C/add-connection-glib +examples/C/get-active-connections +examples/C/get-ap-info-libnm-glib +examples/C/list-connections-dbus +examples/C/list-connections-libnm-glib + callouts/nm-dhcp-client.action callouts/nm-avahi-autoipd.action callouts/nm-dispatcher.action @@ -95,6 +101,7 @@ libnm-glib/tests/test-remote-settings-client src/tests/test-dhcp-options src/tests/test-policy-hosts src/tests/test-wifi-ap-utils +src/dhcp-manager/tests/test-dhcp-dhclient system-settings/plugins/keyfile/tests/test-keyfile system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh @@ -102,6 +109,7 @@ system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils system-settings/plugins/ifcfg-rh/tests/network-scripts/Test_Write_* system-settings/plugins/ifcfg-rh/tests/network-scripts/*-Test_Write_* system-settings/plugins/ifupdown/tests/test-ifupdown +system-settings/plugins/ifnet/tests/check_ifnet m4/gtk-doc.m4 m4/intltool.m4 |