Changeset f907928 in dispositivos_moviles for TibisayMovil/res/menu/file_to_encrypt.xml

Timestamp:
Oct 22, 2013, 3:53:16 PM (11 years ago)
Author:
Jose Ruiz <joseruiz@…>
Branches:
master
Children:
3fe55cf
Parents:
288126d (diff), c231890 (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/AndroidManifest?.xml
TibisayMovil?/gen/net/neiti/droidtext/R.java
TibisayMovil?/gen/ve/gob/cenditel/tibisaymovil/R.java
TibisayMovil?/src/ve/gob/cenditel/tibisaymovil/CertificateRepositoryActivity.java
TibisayMovil?/src/ve/gob/cenditel/tibisaymovil/TibisayMovilActivity.java

File:
1 added

Note: See TracChangeset for help on using the changeset viewer.