Changeset 1a56d4c in dispositivos_moviles for TibisayMovil/AndroidManifest.xml


Ignore:
Timestamp:
Jul 16, 2013, 10:59:46 AM (11 years ago)
Author:
Jose Ruiz <joseruiz@…>
Branches:
master
Children:
37467be
Parents:
08c45bd (diff), 09c6eb7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of https://tibisay.cenditel.gob.ve/trac/scm/git/dispositivos_moviles

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TibisayMovil/AndroidManifest.xml

    r08c45bd r1a56d4c  
    2323            </intent-filter>
    2424        </activity>
    25         <activity android:name="KeyChainActivity"></activity>
     25        <activity android:name="CertificateRepositoryActivity"></activity>
     26        <activity android:name="PKCS12FilePickerActivity"></activity>
    2627    </application>
    2728
Note: See TracChangeset for help on using the changeset viewer.