• 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
Name
Last commit
Last update
..
compass.cpp Loading commit data...
compass.h Loading commit data...
datarange.h Loading commit data...
datatypes.pro Loading commit data...
genericdata.h Loading commit data...
magneticfield.h Loading commit data...
orientation.cpp Loading commit data...
orientation.h Loading commit data...
orientationdata.h Loading commit data...
posedata.h Loading commit data...
proximity.h Loading commit data...
tap.cpp Loading commit data...
tap.h Loading commit data...
tapdata.h Loading commit data...
timedunsigned.h Loading commit data...
touchdata.h Loading commit data...
unsigned.cpp Loading commit data...
unsigned.h Loading commit data...
utils.cpp Loading commit data...
utils.h Loading commit data...
xyz.cpp Loading commit data...
xyz.h Loading commit data...