summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAndreas Volz <andreas@optolix.mittelerde>2008-09-29 23:17:03 +0200
committerAndreas Volz <andreas@optolix.mittelerde>2008-09-29 23:17:03 +0200
commit13219dd9fce15fab53b27fcc59f66bf15f053956 (patch)
tree5b690c2439c5d79200bf56caf955ebea5469feeb /tools
parentc1c741cb0c6e0d920f60c9862556a5dd4e68da2e (diff)
parent5b13d582bc1114d474278e092d2709c9570415c4 (diff)
downloaddbus-c++-13219dd9fce15fab53b27fcc59f66bf15f053956.tar.gz
merge from freedesktop.org
Merge git://anongit.freedesktop.org/git/dbus/dbus-c++ Conflicts: examples/echo/echo-server.cpp examples/properties/props-server.cpp
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions