Changeset f907928 in dispositivos_moviles for TibisayMovil/gen/net/neiti/droidtext/R.java

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:

• TibisayMovil/gen/net/neiti/droidtext/R.java (modified) (1 diff)

TibisayMovil/gen/net/neiti/droidtext/R.java

@@ -9 +9 @@
 public final class R {
         public static final class id {
-                public static final int button = 0x7f0b006c;
-                public static final int text = 0x7f0b006d;
+                public static final int button = 0x7f0c0072;
+                public static final int text = 0x7f0c0073;
         }
         public static final class string {
-                public static final int hello = 0x7f050000;
-                public static final int app_name = 0x7f050001;
+                public static final int hello = 0x7f060000;
+                public static final int app_name = 0x7f060001;
         }
         public static final class layout {
-                public static final int main = 0x7f030025;
+                public static final int main = 0x7f03002d;
         }
         public static final class drawable {