Merge branch 'master' of github.com:alt236/Bluetooth-LE-Library---Android

Conflicts:
	README.md
This commit is contained in:
Alexandros Schillings committed 2015-07-14 17:18:04 +01:00
commit 51c9e5ca90
1 file changed
+1 -1
+1 -1
View File
@@ -174,4 +174,4 @@ All logos are the property of their respective owners.
The code in this project is licensed under the Apache Software License 2.0.
Copyright (c) 2014 Alexandros Schillings.
Copyright (c) 2014 Alexandros Schillings.