Commit 421fa7b
committed
Merge pull request androidannotations#1023 from WonderCsabo/974_mergeTestProjects
Conflicts:
AndroidAnnotations/functional-test-1-5-tests/pom.xmlFile tree
75 files changed
+426
-337
lines changed- AndroidAnnotations
- functional-test-1-5-tests
- .settings
- src/test
- java/org/androidannotations/test15
- resources
- functional-test-1-5
- .settings
- src/test/java
- org
- androidannotations/test15
- afterextras
- afterinject
- afterviews
- application
- ebean
- efragment
- eintentservice
- ereceiver
- eviewgroup
- eview
- inheritance
- instancestate
- ormlite
- otto
- prefs
- receiver
- rest
- res
- roboguice
- sherlock
- supposethread
- trace
- robolectric
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
75 files changed
+426
-337
lines changedThis file was deleted.
Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 0 additions & 5 deletions
This file was deleted.
This file was deleted.
Lines changed: 0 additions & 39 deletions
This file was deleted.
Lines changed: 0 additions & 26 deletions
This file was deleted.
Lines changed: 0 additions & 43 deletions
This file was deleted.
Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 0 additions & 4 deletions
This file was deleted.
0 commit comments