Changeset df1c09f in dispositivos_moviles for TibisayMovil/gen/net/neiti/droidtext

Timestamp:

Oct 23, 2013, 5:11:04 PM (11 years ago)

Author:

Antonio Araujo Brett <aaraujo@…>

Branches:

master

Children:

bed5c59

Parents:

292b560 (diff), e61e3a6 (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:

.gitignore

File:

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

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

@@ -8 +8 @@
 
 public final class R {
-        public static final class id {
-                public static final int button = 0x7f0c0072;
-                public static final int text = 0x7f0c0073;
-        }
-        public static final class string {
-                public static final int hello = 0x7f060000;
-                public static final int app_name = 0x7f060001;
-        }
-        public static final class layout {
-                public static final int main = 0x7f03002e;
-        }
         public static final class drawable {
                 public static final int icon = 0x7f020043;
         }
+        public static final class id {
+                public static final int button = 0x7f0c0073;
+                public static final int text = 0x7f0c0074;
+        }
+        public static final class layout {
+                public static final int main = 0x7f030030;
+        }
+        public static final class string {
+                public static final int app_name = 0x7f060001;
+                public static final int hello = 0x7f060000;
+        }
 }