Merge branch 'develop' of github.com:LiyouZhou/ble into develop

Browse Source

Conflicts:
	ble/services/DFUService.h

master

Liyou Zhou 2015-11-24 18:35:34 +00:00

parent 2bcad22d08 e45e9dfec9

commit f31f095879

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available