rebase of android-generic, using git apply because rebase did not work
authorkenstir <kenstir@gmail.com>
Sat, 14 Nov 2015 02:52:03 +0000 (21:52 -0500)
committerkenstir <kenstir@gmail.com>
Sat, 14 Nov 2015 02:52:03 +0000 (21:52 -0500)
commit691c3aeeea47c4519ea8873ee69f54682dfa7f0e
treedfb2283154d876a618410c9d232e75b665c91ccc
parent37088e94a1bc45be0241783b56b73db7b6c3b74a
rebase of android-generic, using git apply because rebase did not work
40 files changed:
Open-ILS/src/Android/core/res/layout/activity_choose_library.xml [new file with mode: 0644]
Open-ILS/src/Android/core/res/layout/activity_login.xml
Open-ILS/src/Android/core/res/layout/activity_splash.xml
Open-ILS/src/Android/core/res/values/ou.xml
Open-ILS/src/Android/core/res/values/strings.xml
Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/AccountAccess.java
Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java
Open-ILS/src/Android/core/src/org/evergreen_ils/auth/AuthenticatorActivity.java
Open-ILS/src/Android/core/src/org/evergreen_ils/auth/EvergreenAuthenticator.java
Open-ILS/src/Android/core/src/org/evergreen_ils/barcodescan/CaptureActivity.java
Open-ILS/src/Android/core/src/org/evergreen_ils/globals/AppPrefs.java [new file with mode: 0644]
Open-ILS/src/Android/core/src/org/evergreen_ils/globals/GlobalConfigs.java
Open-ILS/src/Android/core/src/org/evergreen_ils/globals/Utils.java
Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/Library.java [new file with mode: 0644]
Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SearchCatalog.java
Open-ILS/src/Android/core/src/org/evergreen_ils/searchCatalog/SearchCatalogListView.java
Open-ILS/src/Android/core/src/org/evergreen_ils/views/ApplicationPreferences.java [deleted file]
Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseLibraryActivity.java [new file with mode: 0644]
Open-ILS/src/Android/core/src/org/evergreen_ils/views/UnusedPreferenceActivity.java [new file with mode: 0644]
Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/LoadingTask.java
Open-ILS/src/Android/core/src/org/evergreen_ils/views/splashscreen/SplashActivity.java
Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
Open-ILS/src/Android/cwmars_app/res/values/ou.xml
Open-ILS/src/Android/demo_app/AndroidManifest.xml
Open-ILS/src/Android/eg_app/.idea/.name [new file with mode: 0644]
Open-ILS/src/Android/eg_app/.idea/compiler.xml [new file with mode: 0644]
Open-ILS/src/Android/eg_app/.idea/copyright/profiles_settings.xml [new file with mode: 0644]
Open-ILS/src/Android/eg_app/.idea/encodings.xml [new file with mode: 0644]
Open-ILS/src/Android/eg_app/.idea/libraries/libs.xml [new file with mode: 0644]
Open-ILS/src/Android/eg_app/.idea/misc.xml [new file with mode: 0644]
Open-ILS/src/Android/eg_app/.idea/modules.xml [new file with mode: 0644]
Open-ILS/src/Android/eg_app/.idea/scopes/scope_settings.xml [new file with mode: 0644]
Open-ILS/src/Android/eg_app/.idea/uiDesigner.xml [new file with mode: 0644]
Open-ILS/src/Android/eg_app/.idea/vcs.xml [new file with mode: 0644]
Open-ILS/src/Android/eg_app/AndroidManifest.xml [new file with mode: 0644]
Open-ILS/src/Android/eg_app/eg_app.iml [new file with mode: 0644]
Open-ILS/src/Android/eg_app/res/values/ou.xml [new file with mode: 0644]
Open-ILS/src/Android/kenstir_parse_logcat.pl
Open-ILS/src/Android/support/v7/gridlayout/.classpath [deleted file]
Open-ILS/src/Android/support/v7/gridlayout/.project [deleted file]