Alexander Brakowski a6c13f7300 merge wifidirect changes 9 vuotta sitten
..
opengl cb543bc5ca merged conflicts 9 vuotta sitten
AboutFragment.java cb543bc5ca merged conflicts 9 vuotta sitten
ConnectionInfoDialogFragment.java cb543bc5ca merged conflicts 9 vuotta sitten
HomeFragment.java f80bf8764d fixed merge conflicts 9 vuotta sitten
PreferenceHostageFrament.java cb543bc5ca merged conflicts 9 vuotta sitten
ProfileEditFragment.java f80bf8764d fixed merge conflicts 9 vuotta sitten
ProfileManagerFragment.java cb543bc5ca merged conflicts 9 vuotta sitten
RecordDetailFragment.java f80bf8764d fixed merge conflicts 9 vuotta sitten
RecordOverviewFragment.java a6c13f7300 merge wifidirect changes 9 vuotta sitten
ServicesFragment.java cb543bc5ca merged conflicts 9 vuotta sitten
SettingsFragment.java 66b19427a8 Merged rc - branch and small clean up 10 vuotta sitten
StatisticsFragment.java cb543bc5ca merged conflicts 9 vuotta sitten
ThreatMapFragment.java f80bf8764d fixed merge conflicts 9 vuotta sitten
TrackerFragment.java f80bf8764d fixed merge conflicts 9 vuotta sitten
UpNavigatibleFragment.java 66b19427a8 Merged rc - branch and small clean up 10 vuotta sitten