![]() Merge git://anongit.freedesktop.org/git/dbus/dbus-c++ Conflicts: configure.ac examples/Makefile.am |
||
---|---|---|
.. | ||
.deps | ||
echo | ||
ecore | ||
glib | ||
hal | ||
properties | ||
properties_get_set | ||
Makefile.am |
![]() Merge git://anongit.freedesktop.org/git/dbus/dbus-c++ Conflicts: configure.ac examples/Makefile.am |
||
---|---|---|
.. | ||
.deps | ||
echo | ||
ecore | ||
glib | ||
hal | ||
properties | ||
properties_get_set | ||
Makefile.am |