← Back to branch summary

~thomas-voss/biometryd/remove-obsolete-configuration-header

~thomas-voss/biometryd/remove-obsolete-configuration-header

Viewing all changes in revision 2.

Committer: Thomas Voß
Date: 2016-05-04 12:21:10 UTC
mfrom: (1.1.1 add-run-cmd)
Revision ID: thomas.voss@canonical.com-20160504122110-081v992eu2yka3zw

Merge lp:~thomas-voss/biometryd/add-run-cmd

files added:
src/biometry/cmds/run.cpp

src/biometry/cmds/run.h

src/biometry/devices/dispatching.cpp

src/biometry/devices/dispatching.h

src/biometry/devices/dummy.cpp

src/biometry/devices/dummy.h

src/biometry/dispatching_service.cpp

src/biometry/dispatching_service.h

src/biometry/util

src/biometry/util/configuration.cpp

src/biometry/util/configuration.h

src/biometry/util/dispatcher.cpp

src/biometry/util/dispatcher.h

src/biometry/util/json_configuration_builder.cpp

src/biometry/util/json_configuration_builder.h

src/biometry/util/not_implemented.cpp

src/biometry/util/not_implemented.h

src/biometry/util/streaming_configuration_builder.h

tests/test_daemon.cpp

tests/test_dispatching_service_and_device.cpp

files removed:
src/util

src/util/CMakeLists.txt

src/util/configuration.cpp

src/util/configuration.h

files renamed:
src/util/atomic_counter.cpp => src/biometry/util/atomic_counter.cpp

src/util/atomic_counter.h => src/biometry/util/atomic_counter.h

src/util/dynamic_library.cpp => src/biometry/util/dynamic_library.cpp

src/util/dynamic_library.h => src/biometry/util/dynamic_library.h

src/util/json.hpp => src/biometry/util/json.hpp

src/util/once.h => src/biometry/util/once.h

src/util/synchronized.h => src/biometry/util/synchronized.h

src/util/variant.cpp => src/biometry/util/variant.cpp

src/util/variant.h => src/biometry/util/variant.h

files modified:
include/biometry/device.h

src/CMakeLists.txt

src/biometry/CMakeLists.txt

src/biometry/cmds/enroll.cpp

src/biometry/cmds/enroll.h

src/biometry/cmds/help.cpp

src/biometry/cmds/identify.cpp

src/biometry/cmds/identify.h

src/biometry/daemon.cpp

src/biometry/daemon.h

src/biometry/daemon_main.cpp

src/biometry/dbus/skeleton/device.h

src/biometry/dbus/skeleton/identifier.cpp

src/biometry/dbus/skeleton/identifier.h

src/biometry/dbus/skeleton/service.h

src/biometry/dbus/skeleton/template_store.cpp

src/biometry/dbus/skeleton/template_store.h

src/biometry/dbus/stub/device.h

src/biometry/devices/plugin/loader.h

tests/CMakeLists.txt

tests/did_finish_successfully.h

tests/test_atomic_counter.cpp

tests/test_configuration.cpp

tests/test_dictionary.cpp

tests/test_plugin_device.cpp

Show diffs side-by-side

added added

removed removed

include/biometry/device.h

src/CMakeLists.txt

src/biometry/CMakeLists.txt

src/biometry/cmds/enroll.cpp

src/biometry/cmds/enroll.h

src/biometry/cmds/help.cpp

src/biometry/cmds/identify.cpp

src/biometry/cmds/identify.h

src/biometry/cmds/run.cpp

src/biometry/cmds/run.h

src/biometry/daemon.cpp

src/biometry/daemon.h

src/biometry/daemon_main.cpp

src/biometry/dbus/skeleton/device.h

src/biometry/dbus/skeleton/identifier.cpp

src/biometry/dbus/skeleton/identifier.h

src/biometry/dbus/skeleton/service.h

src/biometry/dbus/skeleton/template_store.cpp

src/biometry/dbus/skeleton/template_store.h

src/biometry/dbus/stub/device.h

src/biometry/devices/dispatching.cpp

src/biometry/devices/dispatching.h

src/biometry/devices/dummy.cpp

src/biometry/devices/dummy.h

src/biometry/devices/plugin/loader.h

src/biometry/dispatching_service.cpp

src/biometry/dispatching_service.h

src/biometry/util/

src/biometry/util/atomic_counter.cpp

src/biometry/util/atomic_counter.h

src/biometry/util/configuration.cpp

src/biometry/util/configuration.h

src/biometry/util/dispatcher.cpp

src/biometry/util/dispatcher.h

src/biometry/util/dynamic_library.cpp

src/biometry/util/dynamic_library.h

src/biometry/util/json_configuration_builder.cpp

src/biometry/util/json_configuration_builder.h

src/biometry/util/not_implemented.cpp

src/biometry/util/not_implemented.h

src/biometry/util/once.h

src/biometry/util/streaming_configuration_builder.h

src/biometry/util/synchronized.h

src/util/CMakeLists.txt

src/util/configuration.cpp

src/util/configuration.h

tests/CMakeLists.txt

tests/did_finish_successfully.h

tests/test_atomic_counter.cpp

tests/test_configuration.cpp

tests/test_daemon.cpp

tests/test_dictionary.cpp

tests/test_dispatching_service_and_device.cpp

tests/test_plugin_device.cpp

Older »