jeena/dbus-cplusplus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

merge from freedesktop.org

Browse source 
Merge git://anongit.freedesktop.org/git/dbus/dbus-c++

Conflicts:

	examples/echo/echo-server.cpp
	examples/properties/props-server.cpp
This commit is contained in:
Andreas Volz 2008-09-29 23:17:03 +02:00
commit 13219dd9fc
18 changed files with 124 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

1
examples/echo/echo-server.cpp
View file

@ -24,7 +24,6 @@ int32_t EchoServer::Random()
std::string EchoServer::Hello(const std::string &name)
{
sleep (5);
return "Hello " + name + "!";
}