| 4ea6e425e7ead4a762f3be06e94c2522d2fcf06b |
|
07-Mar-2011 |
Tyler Schultz <tylerschultz@gmail.com> |
Merge branch 'master' of https://github.com/rcdickerson/robolectric into rcdickerson-master
Conflicts:
src/main/java/com/xtremelabs/robolectric/Robolectric.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowDialog.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowNetworkInfo.java
src/main/java/com/xtremelabs/robolectric/shadows/ShadowProgressBar.java
src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/FakeHttpLayer.java
|
| ca8b4e7c96507b66cb816a3383c93b02d79a7685 |
|
07-Mar-2011 |
Tyler Schultz <tylerschultz@gmail.com> |
Merge branch 'master' of https://github.com/zoodles/robolectric into zoodles-master
|
| 8854adc03b66442ceb8edef27ca4f6993f792d23 |
|
11-Feb-2011 |
Michael Portuesi <mikep@zoodles.com> |
More merging with pivotal/robolectric
|
| 079a071612e45353e46bde2f29eff7e6fc762f01 |
|
11-Feb-2011 |
Rich Humphrey <rich@zoodles.com> |
Added ShadowPreference and ShadowProgressBar
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/DialogPreferenceTest.java
|
| 94c593173ef0ac64cca724199d6228057e1c8fd8 |
|
10-Feb-2011 |
Rich Humphrey <rich@zoodles.com> |
Added ShadowDialogPreference
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/DialogPreferenceTest.java
|
| 4df0e9ff4f1c1088c4bf2b7eec39bfc8b999dcb1 |
|
10-Feb-2011 |
Rich Humphrey <rich@zoodles.com> |
Added ShadowDialogPreference
/external/robolectric/src/test/java/com/xtremelabs/robolectric/shadows/DialogPreferenceTest.java
|