« Previous | Next » 

Revision 4f7b2601

ID4f7b26017dcca644d0ceb51bacf5a9acc3397de0

Added by Adam Menz over 12 years ago

Merge branch 'load_balancers-2' into experimental_2

Conflicts:
.classpath
AndroidManifest.xml
res/layout/createserver.xml
src/com/rackspace/cloud/files/api/client/CustomHttpClient.java
src/com/rackspacecloud/android/AddServerActivity.java
src/com/rackspacecloud/android/ListAccountsActivity.java

Files

  • added
  • modified
  • copied
  • renamed
  • deleted