« Previous | Next » 

Revision ac513060

IDac51306020fbaf32d41e5881b60488762ebc3250

Added by Adam Menz over 11 years ago

Merge branch 'mutipleAccounts' into HEAD

Conflicts:
AndroidManifest.xml
src/com/rackspace/cloud/servers/api/client/FlavorManager.java
src/com/rackspace/cloud/servers/api/client/ImageManager.java
src/com/rackspace/cloud/servers/api/client/ServerManager.java
src/com/rackspace/cloud/servers/api/client/http/Authentication.java
src/com/rackspacecloud/android/ListServersActivity.java
src/com/rackspacecloud/android/RackspaceCloudActivity.java

Files

  • added
  • modified
  • copied
  • renamed
  • deleted