Alexander Brakowski 708745fb50 Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 9 éve
..
android 755855f0ce Improved error reporting and general synchronization with Tracing 9 éve
bluetooth 755855f0ce Improved error reporting and general synchronization with Tracing 9 éve
nfc 29a19bfa6f Fixed message record id autoincrementation; 9 éve
p2p ecdf710ab4 new wifidirect ui will now be loaded on wifidirect sync 9 éve
tracing 755855f0ce Improved error reporting and general synchronization with Tracing 9 éve
wifi_direct 743e806958 WiFi Direct Failure Messages. 9 éve
SyncMessage.java 18407e60f6 changed bluetooth synchronization to use our new protocol 9 éve
Synchronizer.java 1c85b759d0 Merge branch 'tracing_sync' 9 éve