Merge branch 'develop' of ../../nrf-toolbox/ into develop

NordicSemiconductor · Jan 23, 2018 · e44ea97 · e44ea97
2 parents 02e05fb + a9a57b7
commit e44ea97
Show file tree

Hide file tree

Showing 37 changed files with 521 additions and 1,450 deletions.
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,9 +1,9 @@
 PODS:
   - CorePlot (2.2)
-  - EVReflection (5.4.0):
-    - EVReflection/Core (= 5.4.0)
-  - EVReflection/Core (5.4.0)
-  - iOSDFULibrary (4.1.0):
+  - EVReflection (5.4.4):
+    - EVReflection/Core (= 5.4.4)
+  - EVReflection/Core (5.4.4)
+  - iOSDFULibrary (4.1.1):
     - Zip (~> 1.0)
   - SWRevealViewController (2.3.0)
   - Zip (1.1.0)
@@ -16,11 +16,11 @@ DEPENDENCIES:
 
 SPEC CHECKSUMS:
   CorePlot: cbe0c6e14220705e32e06a89c7d6a5a908b7d7d8
-  EVReflection: 58296497e901ba9803228055689e835864b3f43f
-  iOSDFULibrary: e245240cc1096f3961f2e5ec53860f8fca1ff648
+  EVReflection: 3f6d255f8173ec81a2a6aad81482f253cff82b55
+  iOSDFULibrary: 35e8a9e23d67759d57af9924d7a808e48c04583a
   SWRevealViewController: 6d3fd97f70112fd7cef9de14df4260eacce4c63a
   Zip: 8877eede3dda76bcac281225c20e71c25270774c
 
 PODFILE CHECKSUM: 27aaa69ef26831a42d969fc2d11fc0913adbff1e
 
-COCOAPODS: 1.4.0.beta.2
+COCOAPODS: 1.4.0
diff --git a/Pods/EVReflection/Source/EVReflection.swift b/Pods/EVReflection/Source/EVReflection.swift
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/Target Support Files/EVReflection/Info.plist b/Pods/Target Support Files/EVReflection/Info.plist
diff --git a/Pods/Target Support Files/Pods-nRF Toolbox/Pods-nRF Toolbox-frameworks.sh b/Pods/Target Support Files/Pods-nRF Toolbox/Pods-nRF Toolbox-frameworks.sh
diff --git a/Pods/Target Support Files/iOSDFULibrary/Info.plist b/Pods/Target Support Files/iOSDFULibrary/Info.plist
diff --git a/Pods/iOSDFULibrary/iOSDFULibrary/Classes/Implementation/DFUServiceDelegate.swift b/Pods/iOSDFULibrary/iOSDFULibrary/Classes/Implementation/DFUServiceDelegate.swift
diff --git a/Pods/iOSDFULibrary/iOSDFULibrary/Classes/Implementation/Firmware/DFUFirmware.swift b/Pods/iOSDFULibrary/iOSDFULibrary/Classes/Implementation/Firmware/DFUFirmware.swift
diff --git a/Pods/iOSDFULibrary/iOSDFULibrary/Classes/Implementation/GenericDFU/DFUExecutor.swift b/Pods/iOSDFULibrary/iOSDFULibrary/Classes/Implementation/GenericDFU/DFUExecutor.swift
diff --git a/Pods/iOSDFULibrary/iOSDFULibrary/Classes/Implementation/GenericDFU/DFUPeripheral.swift b/Pods/iOSDFULibrary/iOSDFULibrary/Classes/Implementation/GenericDFU/DFUPeripheral.swift
diff --git a/...iOSDFULibrary/iOSDFULibrary/Classes/Implementation/GenericDFU/DFUPeripheralDelegate.swift b/...iOSDFULibrary/iOSDFULibrary/Classes/Implementation/GenericDFU/DFUPeripheralDelegate.swift