« Previous | Next » 

Revision 55b9f635

ID55b9f635347a08d596ebe937fc3d54f4a73d8cfb

Added by Giannis Koutsoubos almost 11 years ago

Merge remote-tracking branch 'origin/master'

Conflicts:
.classpath
src/com/rackspace/cloud/files/api/client/ContainerManager.java
src/com/rackspace/cloud/files/api/client/CustomHttpClient.java
src/com/rackspace/cloud/servers/api/client/Account.java
src/com/rackspace/cloud/servers/api/client/Backup.java
src/com/rackspace/cloud/servers/api/client/FlavorManager.java
src/com/rackspace/cloud/servers/api/client/ServerManager.java
src/com/rackspace/cloud/servers/api/client/http/Authentication.java
src/com/rackspacecloud/android/AddAccountActivity.java
src/com/rackspacecloud/android/AddFileActivity.java
src/com/rackspacecloud/android/AddServerActivity.java
src/com/rackspacecloud/android/EnableCDNActivity.java
src/com/rackspacecloud/android/GaActivity.java
src/com/rackspacecloud/android/GaListActivity.java
src/com/rackspacecloud/android/ListAccountsActivity.java
src/com/rackspacecloud/android/ListServersActivity.java
src/com/rackspacecloud/android/PasswordServerActivity.java
src/com/rackspacecloud/android/PingServerActivity.java
src/com/rackspacecloud/android/Preferences.java
src/com/rackspacecloud/android/ServerErrorActivity.java
src/com/rackspacecloud/android/TabViewActivity.java
src/com/rackspacecloud/android/ViewServerActivity.java

Files

  • added
  • modified
  • copied
  • renamed
  • deleted