forked from androidquery/androidquery
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' of github.com:androidquery/androidquery into dev
Conflicts: demo/AndroidManifest.xml
- Loading branch information
Showing
199 changed files
with
13,185 additions
and
12,723 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="src" path="src"/> | ||
| <classpathentry kind="src" path="gen"/> | ||
| <classpathentry kind="src" path="auth"/> | ||
| <classpathentry kind="src" path="beta"/> | ||
| <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> | ||
| <classpathentry kind="lib" path="auth-lib/signpost-commonshttp4-1.2.1.1.jar"/> | ||
| <classpathentry kind="lib" path="auth-lib/signpost-core-1.2.1.1.jar"/> | ||
| <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> | ||
| <classpathentry kind="output" path="bin/classes"/> | ||
| </classpath> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="src" path="src"/> | ||
| <classpathentry kind="src" path="gen"/> | ||
| <classpathentry kind="src" path="auth"/> | ||
| <classpathentry kind="src" path="beta"/> | ||
| <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> | ||
| <classpathentry kind="lib" path="auth-lib/signpost-commonshttp4-1.2.1.1.jar"/> | ||
| <classpathentry kind="lib" path="auth-lib/signpost-core-1.2.1.1.jar"/> | ||
| <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> | ||
| <classpathentry kind="output" path="bin/classes"/> | ||
| </classpath> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,20 @@ | ||
| # built application files | ||
| *.apk | ||
| *.ap_ | ||
|
|
||
| # files for the dex VM | ||
| *.dex | ||
|
|
||
| # Java class files | ||
| *.class | ||
| dist/*.jar | ||
|
|
||
| # generated files | ||
| bin/ | ||
| gen/ | ||
|
|
||
| # Local configuration file (sdk path, etc) | ||
| local.properties | ||
|
|
||
| # built application files | ||
| *.apk | ||
| *.ap_ | ||
|
|
||
| # files for the dex VM | ||
| *.dex | ||
|
|
||
| # Java class files | ||
| *.class | ||
| dist/*.jar | ||
|
|
||
| # generated files | ||
| bin/ | ||
| gen/ | ||
|
|
||
| # Local configuration file (sdk path, etc) | ||
| local.properties | ||
|
|
||
| proguard-dump.txt | ||
| /assets |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,33 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>AndroidQuery</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>com.android.ide.eclipse.adt.ApkBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>com.android.ide.eclipse.adt.AndroidNature</nature> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| </natures> | ||
| </projectDescription> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>AndroidQuery</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>com.android.ide.eclipse.adt.ApkBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>com.android.ide.eclipse.adt.AndroidNature</nature> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| </natures> | ||
| </projectDescription> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| #Thu Sep 15 10:15:42 CST 2011 | ||
| eclipse.preferences.version=1 | ||
| filesCopiedToWebInfLib= | ||
| #Thu Sep 15 10:15:42 CST 2011 | ||
| eclipse.preferences.version=1 | ||
| filesCopiedToWebInfLib= |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| Welcome to the androidquery GitHub home. | ||
|
|
||
| Click [here](http://code.google.com/p/android-query/wiki/AsyncAPI) for wiki at GoogleCode | ||
| or visit: | ||
| Welcome to the androidquery GitHub home. | ||
|
|
||
| Click [here](http://code.google.com/p/android-query/wiki/AsyncAPI) for wiki at GoogleCode | ||
| or visit: | ||
| http://code.google.com/p/android-query/wiki/AsyncAPI |
Oops, something went wrong.