patrik
|
fce517d4b8
|
add bjnp library and the scripts bjnp-discover and broadcast-bjnp-discover
commit d41a28813e4e4d26aeaab300ad30ad7c4116e37d
Merge: a45e4e2 23fc8f1
Author: Patrik Karlsson <patrik@cqure.net>
Date: Sun Aug 5 20:53:04 2012 +0200
Merge branch 'master' into bjnp
Conflicts:
CHANGELOG
commit a45e4e2fd0c2579afc8d5b162bb5484327494b72
Author: Patrik Karlsson <patrik@cqure.net>
Date: Sun Aug 5 20:44:19 2012 +0200
add bjnp library and the scripts bjnp-discover and broadcast-bjnp-discover
|
2012-08-05 18:55:40 +00:00 |
|