Skip to content

1.4 integrate with master#34

Draft
tipatterson-dev wants to merge 222 commits intomasterfrom
1.4_integrate_with_master
Draft

1.4 integrate with master#34
tipatterson-dev wants to merge 222 commits intomasterfrom
1.4_integrate_with_master

Conversation

@tipatterson-dev
Copy link
Member

No description provided.

…l server/servlet working as it does in v1.4 branch
Not yet implemented in MainActivity
# Conflicts:
#	sensorhub-android-app/AndroidManifest.xml
#	sensorhub-android-app/res/values/strings.xml
#	sensorhub-android-app/res/xml/pref_sensors.xml
#	sensorhub-android-app/src/org/sensorhub/android/MainActivity.java
#	sensorhub-android-app/src/org/sensorhub/android/UserSettingsActivity.java
#	sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/AndroidSensorsConfig.java
#	sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/AndroidSensorsDriver.java
#	sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/audio/AndroidAudioOutput.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants