Changeset c874484 in dispositivos_moviles for TibisayMovil/AndroidManifest.xml


Ignore:
Timestamp:
Oct 23, 2013, 4:33:49 PM (11 years ago)
Author:
Antonio Araujo Brett <aaraujo@…>
Branches:
master
Children:
292b560
Parents:
f0566b4 (diff), 8243993 (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

Conflicts:

TibisayMovil?/gen/net/neiti/droidtext/R.java
TibisayMovil?/gen/ve/gob/cenditel/tibisaymovil/R.java

File:
1 edited

Legend:

Unmodified
Added
Removed

  • TibisayMovil/AndroidManifest.xml

    rfd4a5b9 rc874484  
    1010
    1111    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     12    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     13    <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
    1214    <uses-permission android:name="android.permission.INTERNET" />
    1315
    … …  
    3234        <activity android:name="ve.gob.cenditel.tibisaymovil.FileToSignHandwrittenSignatureActivity" >
    3335        </activity>
     36        <activity android:name="ve.gob.cenditel.tibisaymovil.FilesToPKCS7SignActivity" >
     37        </activity>
     38        <activity android:name="ve.gob.cenditel.tibisaymovil.FilesToPDFSignActivity" >
     39        </activity>
    3440        <activity android:name="ve.gob.cenditel.tibisaymovil.CaptureImgHandwrittenSignatureActivity" >
    3541        </activity>
    … …  
    3844        <activity android:name="ve.gob.cenditel.tibisaymovil.SignResultHandwrittenSignatureActivity" >
    3945        </activity>
     46        <activity android:name="ve.gob.cenditel.tibisaymovil.SelectImgHandwrittenSignatureActivity" >
     47        </activity>
     48        <activity android:name="ve.gob.cenditel.tibisaymovil.PreferencesActivity" >
     49        </activity>
    4050        <activity android:name="ve.gob.cenditel.tibisaymovil.FileToVerifySignatureActivity" >
     51        </activity>
     52        <activity android:name="ve.gob.cenditel.tibisaymovil.KeyChainActivity" >
     53        </activity>
     54        <activity android:name="ve.gob.cenditel.tibisaymovil.CertValidatorActivity" >
     55        </activity>
     56        <activity android:name="ve.gob.cenditel.tibisaymovil.FilesToPKCS7SignConfirmationActivity" >
     57        </activity>
     58        <activity android:name="ve.gob.cenditel.tibisaymovil.FilesToPDFSignConfirmationActivity" >
     59        </activity>
     60        <activity android:name="ve.gob.cenditel.tibisaymovil.SignActivity" >
    4161        </activity>
    4262        <activity
Note: See TracChangeset for help on using the changeset viewer.