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
Note: See TracChangeset for help on using the changeset viewer.