Skip to content

Commit

Permalink
Revert "Ignore generated manifest from IntelliJ" because it breaks
Browse files Browse the repository at this point in the history
compilation in IDE

This reverts commit bee449a.
  • Loading branch information
barancev committed Jan 28, 2013
1 parent b32f8ec commit b7a3075
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ iphone/src/objc/atoms.h
/build/
android/client/bin/
android/server/bin/
android/gen/org/openqa/selenium/android/app/Manifest.java
cpp/IEDriver/IEReturnTypes.h
java/org/openqa/selenium/ie/IeReturnTypes.java
java/client/src/org/openqa/selenium/ie/IeReturnTypes.java
Expand Down Expand Up @@ -67,6 +66,7 @@ py/selenium/webdriver/firefox/amd64/
py/selenium/webdriver/firefox/webdriver.xpi
py/selenium/webdriver/firefox/x86/
selenium.egg-info/

*.user
*.cache
obj/
Expand Down
42 changes: 40 additions & 2 deletions android/gen/org/openqa/selenium/android/app/R.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,43 @@
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* aapt tool from the resource data it found. It
* should not be modified by hand.
*/

package org.openqa.selenium.android.app;

/* This stub is for using by IDE only. It is NOT the R class actually packed into APK */
public final class R {
}
public static final class attr {
}
public static final class drawable {
public static final int alert_dialog_icon=0x7f020000;
public static final int ic_menu_add=0x7f020001;
public static final int ic_menu_delete=0x7f020002;
public static final int ic_menu_share=0x7f020003;
public static final int selenium_icon=0x7f020004;
}
public static final class id {
public static final int rssWebView=0x7f060002;
public static final int status=0x7f060000;
public static final int webview=0x7f060001;
}
public static final class layout {
public static final int single_session_layout=0x7f030000;
}
public static final class string {
public static final int app_name=0x7f050009;
public static final int ctx_menu_navigate=0x7f050001;
public static final int default_session_status=0x7f050002;
public static final int httpd_already_started=0x7f050005;
public static final int httpd_not_running=0x7f050008;
public static final int httpd_not_started=0x7f050004;
public static final int httpd_not_stopped=0x7f050007;
public static final int httpd_started=0x7f050003;
public static final int httpd_stopped=0x7f050006;
public static final int main_title=0x7f050000;
}
public static final class xml {
public static final int preferences=0x7f040000;
}
}

0 comments on commit b7a3075

Please sign in to comment.