1. 05 Jun, 2012 1 commit
    • Simon McVittie's avatar
      Merge branch 'upstream-experimental' into upstream · ec3035d8
      Simon McVittie authored
      Conflicts:
      	NEWS
      	bus/Makefile.am
      	bus/Makefile.in
      	bus/bus.c
      	bus/main.c
      	cmake/CMakeLists.txt
      	config.h.in
      	configure
      	configure.ac
      	dbus-1-uninstalled.pc.in
      	dbus/Makefile.am
      	dbus/Makefile.in
      	dbus/dbus-connection.c
      	dbus/dbus-marshal-basic.c
      	dbus/dbus-marshal-header.c
      	dbus/dbus-message-private.h
      	dbus/dbus-message.c
      	dbus/dbus-pending-call.c
      	dbus/dbus-server.c
      	dbus/dbus-sysdeps-unix.c
      	dbus/dbus-test.c
      	doc/dbus-faq.html
      	doc/dbus-launch.1
      	doc/dbus-send.1
      	doc/dbus-specification.html
      	doc/dbus-test-plan.html
      	test/Makefile.am
      	test/Makefile.in
      	test/data/valid-config-files/incoming-limit.conf
      	test/dbus-daemon.c
      	test/internals/refs.c
      	test/marshal.c
      	test/name-test/Makefile.in
      	tools/Makefile.in
      	tools/dbus-monitor.c
      ec3035d8
  2. 27 Mar, 2012 2 commits
  3. 21 Feb, 2012 1 commit
  4. 13 Feb, 2012 1 commit
  5. 21 Sep, 2011 2 commits
  6. 29 Jul, 2011 2 commits
  7. 10 Jun, 2011 2 commits
  8. 01 Jun, 2011 2 commits
  9. 11 Apr, 2011 1 commit
  10. 08 Apr, 2011 1 commit
  11. 17 Feb, 2011 2 commits
  12. 31 Jan, 2011 3 commits