Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
2 changed files with 2 additions and 2 deletions
Showing only changes of commit eae8e50cf8 - Show all commits

View File

@ -41,7 +41,7 @@
<plugin name="cordova-plugin-splashscreen" spec="~4.1.0" /> <plugin name="cordova-plugin-splashscreen" spec="~4.1.0" />
<plugin name="cordova-plugin-camera-with-exif" spec="^1.2.2" /> <plugin name="cordova-plugin-camera-with-exif" spec="^1.2.2" />
<plugin name="cordova-plugin-ble-central" spec="^1.1.4"> <plugin name="cordova-plugin-ble-central" spec="^1.1.4">
<variable name="BLUETOOTH_USAGE_DESCRIPTION" value="INTVAL intervalometer controls" /> <variable name="BLUETOOTH_USAGE_DESCRIPTION" value="INTVAL3 intervalometer controls" />
</plugin> </plugin>
<engine name="android" spec="^6.4.0" /> <engine name="android" spec="^6.4.0" />
<engine name="ios" spec="^4.5.4" /> <engine name="ios" spec="^4.5.4" />

View File

@ -5,6 +5,6 @@ cordova platform add ios
cordova platform add android cordova platform add android
cordova plugin add cordova-plugin-device cordova plugin add cordova-plugin-device
cordova plugin add cordova-plugin-dialogs cordova plugin add cordova-plugin-dialogs
cordova plugin add cordova-plugin-ble-central --variable BLUETOOTH_USAGE_DESCRIPTION="INTVAL intervalometer controls" cordova plugin add cordova-plugin-ble-central --variable BLUETOOTH_USAGE_DESCRIPTION="INTVAL3 intervalometer controls"
cordova plugin add cordova-plugin-statusbar cordova plugin add cordova-plugin-statusbar
cordova plugin add cordova-plugin-camera-with-exif cordova plugin add cordova-plugin-camera-with-exif