aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout/activity_verify_otr.xml (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-2/+4
|\
| * fixed monospace font and android LDaniel Gultsch2015-07-201-2/+4
| * renamed colorsDaniel Gultsch2015-07-131-12/+12
* | Fixes FS#75 - Change color names to reasonable namessteckbrief2015-12-041-10/+10
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-12/+12
|/
* make use of different dimensions for different screen sizesDaniel Gultsch2015-01-131-1/+4
* fixed layout fileDaniel Gultsch2015-01-021-1/+1
* improved OTR verification part oneDaniel Gultsch2015-01-021-188/+146
* made scan and show qr code more accessible in VerifyOtrActivityiNPUTmice2014-11-161-5/+5
* added snackbar to indicate smp. more error handling in verify activityiNPUTmice2014-11-111-0/+12
* initial smp supportiNPUTmice2014-11-111-0/+177