Merge branch 'adamierymenko-dev' into android-jni
This commit is contained in:
commit
dfdd46db80
31 changed files with 173 additions and 160 deletions
|
@ -90,7 +90,7 @@ public enum Event {
|
|||
/**
|
||||
* A more recent version was observed on the network
|
||||
*
|
||||
* <p>Right now this is only triggered if a hub or supernode reports a
|
||||
* <p>Right now this is only triggered if a hub or rootserver reports a
|
||||
* more recent version, and only once. It can be used to trigger a
|
||||
* software update check.</p>
|
||||
*
|
||||
|
|
|
@ -39,7 +39,7 @@ public enum PeerRole {
|
|||
PEER_ROLE_HUB,
|
||||
|
||||
/**
|
||||
* planetary supernode
|
||||
* planetary rootserver
|
||||
*/
|
||||
PEER_ROLE_SUPERNODE
|
||||
PEER_ROLE_ROOTSERVER
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue