Peter Serwylo 3aac399456 Merge branch 'fix-267/nfc-swap' into integration

2015-05-21 07:52:10 +10:00

..

android/content/pm

Run dos2unix on all external source files

2015-05-04 00:08:36 +02:00

com/google/zxing

Also apply fixes to custom zxing code

2015-05-01 00:38:06 +02:00

org/fdroid/fdroid

Merge branch 'fix-267/nfc-swap' into integration

2015-05-21 07:52:10 +10:00