iam.tj Git - NetworkManager.git/commit

projects / NetworkManager.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b2f9747 15a9f29)

author	Dan Williams <dcbw@redhat.com>
	Sun, 2 Jan 2011 23:24:23 +0000 (17:24 -0600)
committer	Dan Williams <dcbw@redhat.com>
	Sun, 2 Jan 2011 23:24:23 +0000 (17:24 -0600)
commit	0587ef1179c7abb1c83ff5d12ce8e1b587ed0625
tree	7e66edf56183e99552e17044433e6eb234359d0b	tree \| snapshot
parent	b2f9747dba513fd34dac2b427ad1e0ac6ccb31e9	commit \| diff
parent	15a9f29a14783fcd1b8e936a8338452737825726	commit \| diff

Merge remote branch 'origin/master' into wimax

17 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
include/NetworkManager.h	diff1 \|	diff2 \|	blob \| history
introspection/nm-manager-client.xml	diff1 \|	diff2 \|	blob \| history
introspection/nm-manager.xml	diff1 \|	diff2 \|	blob \| history
libnm-glib/Makefile.am	diff1 \|	diff2 \|	blob \| history
libnm-glib/libnm-glib.ver	diff1 \|	diff2 \|	blob \| history
libnm-glib/nm-client.c	diff1 \|	diff2 \|	blob \| history
libnm-glib/nm-client.h	diff1 \|	diff2 \|	blob \| history
libnm-glib/nm-device.c	diff1 \|	diff2 \|	blob \| history
libnm-util/Makefile.am	diff1 \|	diff2 \|	blob \| history
libnm-util/libnm-util.ver	diff1 \|	diff2 \|	blob \| history
libnm-util/nm-connection.c	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/nm-manager.c	diff1 \|	diff2 \|	blob \| history
src/nm-manager.h	diff1 \|	diff2 \|	blob \| history
test/nm-tool.c	diff1 \|	diff2 \|	blob \| history

Network connection manager and user applications