• Antti Virtanen's avatar
    Merge branch 'harmattan' · 580ac947
    Antti Virtanen authored
    Conflicts:
    	adaptors/accelerometeradaptor/accelerometeradaptor.cpp
    	adaptors/alsadaptor/alsadaptor.cpp
    	adaptors/alsadaptor/alsadaptor.h
    	adaptors/kbslideradaptor/kbslideradaptor.cpp
    	adaptors/magnetometeradaptor-ascii/magnetometeradaptor-ascii.cpp
    	adaptors/magnetometeradaptor/magnetometeradaptor.cpp
    	adaptors/magnetometeradaptor/magnetometeradaptor.h
    	adaptors/mrstaccelerometer/mrstaccelerometeradaptor.cpp
    	adaptors/mrstaccelerometer/mrstaccelerometeradaptor.h
    	adaptors/proximityadaptor-ascii/proximityadaptor-ascii.cpp
    	adaptors/proximityadaptor-ascii/proximityadaptor-ascii.h
    	adaptors/proximityadaptor-evdev/proximityadaptor-evdev.cpp
    	adaptors/proximityadaptor-evdev/proximityadaptor-evdev.h
    	adaptors/proximityadaptor/proximityadaptor.cpp
    	adaptors/tapadaptor/tapadaptor.cpp
    	adaptors/touchadaptor/touchadaptor.cpp
    	chains/accelerometerchain/accelerometerchain.cpp
    	config/90-sensord-default.conf
    	core/deviceadaptor.h
    	core/inputdevadaptor.cpp
    	core/inputdevadaptor.h
    	core/loader.cpp
    	core/logging.h
    	core/nodebase.h
    	core/sensormanager.h
    	core/sysfsadaptor.cpp
    	core/sysfsadaptor.h
    	datatypes/orientationdata.h
    	debian/changelog
    	filters/orientationinterpreter/orientationinterpreter.cpp
    	sensord.pc
    	sensord/calibrationhandler.cpp
    	sensors/gyroscopesensor/gyroscopesensor.cpp
    	sensors/proximitysensor/proximitysensor.cpp
    	tests/adaptors/adaptortest.cpp
    	tests/client/clientapitest.cpp
    580ac947
sensord-rm_680.conf 880 Bytes