Skip to content

Commit e44ea97

Browse files
Berg, MostafaBerg, Mostafa
Berg, Mostafa
authored and
Berg, Mostafa
committed
Merge branch 'develop' of ../../nrf-toolbox/ into develop
2 parents 02e05fb + a9a57b7 commit e44ea97

37 files changed

+521
-1450
lines changed

Podfile.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
PODS:
22
- CorePlot (2.2)
3-
- EVReflection (5.4.0):
4-
- EVReflection/Core (= 5.4.0)
5-
- EVReflection/Core (5.4.0)
6-
- iOSDFULibrary (4.1.0):
3+
- EVReflection (5.4.4):
4+
- EVReflection/Core (= 5.4.4)
5+
- EVReflection/Core (5.4.4)
6+
- iOSDFULibrary (4.1.1):
77
- Zip (~> 1.0)
88
- SWRevealViewController (2.3.0)
99
- Zip (1.1.0)
@@ -16,11 +16,11 @@ DEPENDENCIES:
1616

1717
SPEC CHECKSUMS:
1818
CorePlot: cbe0c6e14220705e32e06a89c7d6a5a908b7d7d8
19-
EVReflection: 58296497e901ba9803228055689e835864b3f43f
20-
iOSDFULibrary: e245240cc1096f3961f2e5ec53860f8fca1ff648
19+
EVReflection: 3f6d255f8173ec81a2a6aad81482f253cff82b55
20+
iOSDFULibrary: 35e8a9e23d67759d57af9924d7a808e48c04583a
2121
SWRevealViewController: 6d3fd97f70112fd7cef9de14df4260eacce4c63a
2222
Zip: 8877eede3dda76bcac281225c20e71c25270774c
2323

2424
PODFILE CHECKSUM: 27aaa69ef26831a42d969fc2d11fc0913adbff1e
2525

26-
COCOAPODS: 1.4.0.beta.2
26+
COCOAPODS: 1.4.0

Pods/EVReflection/Source/EVReflection.swift

Lines changed: 35 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Manifest.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Target Support Files/EVReflection/Info.plist

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Target Support Files/Pods-nRF Toolbox/Pods-nRF Toolbox-frameworks.sh

Lines changed: 36 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Target Support Files/iOSDFULibrary/Info.plist

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/iOSDFULibrary/iOSDFULibrary/Classes/Implementation/DFUServiceDelegate.swift

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/iOSDFULibrary/iOSDFULibrary/Classes/Implementation/Firmware/DFUFirmware.swift

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/iOSDFULibrary/iOSDFULibrary/Classes/Implementation/GenericDFU/DFUExecutor.swift

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/iOSDFULibrary/iOSDFULibrary/Classes/Implementation/GenericDFU/DFUPeripheral.swift

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/iOSDFULibrary/iOSDFULibrary/Classes/Implementation/GenericDFU/DFUPeripheralDelegate.swift

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)