Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into concurrent

Conflicts:
	Classes/ASIHTTPRequest.m
  • Loading branch information...
commit 43d08fdd4bc4cc26a47f6d0460bc2c491fcd2b95 2 parents ac90541 + 64d0e95
@pokeb authored
Showing with 33 additions and 31 deletions.
  1. +1 −1  Classes/ASIAuthenticationDialog.h
  2. +1 −1  Classes/ASIAuthenticationDialog.m
  3. +1 −1  Classes/ASIFormDataRequest.h
  4. +1 −1  Classes/ASIFormDataRequest.m
  5. +1 −1  Classes/ASIInputStream.h
  6. +1 −1  Classes/ASIInputStream.m
  7. +1 −1  Classes/ASINSStringAdditions.h
  8. +1 −1  Classes/ASINSStringAdditions.m
  9. +1 −1  Classes/ASINetworkQueue.h
  10. +1 −1  Classes/ASINetworkQueue.m
  11. +1 −1  Classes/ASIS3BucketObject.h
  12. +1 −1  Classes/ASIS3BucketObject.m
  13. +1 −1  Classes/ASIS3ListRequest.h
  14. +1 −1  Classes/ASIS3ListRequest.m
  15. +1 −0  Classes/ASIS3Request.h
  16. +1 −0  Classes/ASIS3Request.m
  17. +1 −1  Classes/Tests/ASIFormDataRequestTests.h
  18. +1 −1  Classes/Tests/ASIFormDataRequestTests.m
  19. +1 −1  Classes/Tests/ASIHTTPRequestTests.h
  20. +1 −1  Classes/Tests/ASIHTTPRequestTests.m
  21. +1 −1  Classes/Tests/ASINetworkQueueTests.h
  22. +1 −1  Classes/Tests/ASINetworkQueueTests.m
  23. +1 −1  Classes/Tests/ASIS3RequestTests.h
  24. +1 −1  Classes/Tests/ASIS3RequestTests.m
  25. +1 −1  Classes/Tests/ASITestCase.h
  26. +1 −1  Classes/Tests/ASITestCase.m
  27. +2 −2 Classes/Tests/PerformanceTests.h
  28. +1 −1  Classes/Tests/PerformanceTests.m
  29. +1 −1  Classes/Tests/ProxyTests.h
  30. +1 −1  Classes/Tests/ProxyTests.m
  31. +1 −1  Classes/Tests/StressTests.h
  32. +1 −1  Classes/Tests/StressTests.m
View
2  Classes/ASIAuthenticationDialog.h
@@ -1,6 +1,6 @@
//
// ASIAuthenticationDialog.h
-// iPhone
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 21/08/2009.
// Copyright 2009 All-Seeing Interactive. All rights reserved.
View
2  Classes/ASIAuthenticationDialog.m
@@ -1,6 +1,6 @@
//
// ASIAuthenticationDialog.m
-// iPhone
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 21/08/2009.
// Copyright 2009 All-Seeing Interactive. All rights reserved.
View
2  Classes/ASIFormDataRequest.h
@@ -1,6 +1,6 @@
//
// ASIFormDataRequest.h
-// asi-http-request
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 07/11/2008.
// Copyright 2008-2009 All-Seeing Interactive. All rights reserved.
View
2  Classes/ASIFormDataRequest.m
@@ -1,6 +1,6 @@
//
// ASIFormDataRequest.m
-// asi-http-request
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 07/11/2008.
// Copyright 2008-2009 All-Seeing Interactive. All rights reserved.
View
2  Classes/ASIInputStream.h
@@ -1,6 +1,6 @@
//
// ASIInputStream.h
-// asi-http-request
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 10/08/2009.
// Copyright 2009 All-Seeing Interactive. All rights reserved.
View
2  Classes/ASIInputStream.m
@@ -1,6 +1,6 @@
//
// ASIInputStream.m
-// asi-http-request
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 10/08/2009.
// Copyright 2009 All-Seeing Interactive. All rights reserved.
View
2  Classes/ASINSStringAdditions.h
@@ -1,6 +1,6 @@
//
// ASINSStringAdditions.h
-// asi-http-request
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 12/09/2008.
// Copyright 2008 All-Seeing Interactive. All rights reserved.
View
2  Classes/ASINSStringAdditions.m
@@ -1,6 +1,6 @@
//
// ASINSStringAdditions.m
-// asi-http-request
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 12/09/2008.
// Copyright 2008 All-Seeing Interactive. All rights reserved.
View
2  Classes/ASINetworkQueue.h
@@ -1,6 +1,6 @@
//
// ASINetworkQueue.h
-// asi-http-request
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 07/11/2008.
// Copyright 2008-2009 All-Seeing Interactive. All rights reserved.
View
2  Classes/ASINetworkQueue.m
@@ -1,6 +1,6 @@
//
// ASINetworkQueue.m
-// asi-http-request
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 07/11/2008.
// Copyright 2008-2009 All-Seeing Interactive. All rights reserved.
View
2  Classes/ASIS3BucketObject.h
@@ -1,6 +1,6 @@
//
// ASIS3BucketObject.h
-// Mac
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 13/07/2009.
// Copyright 2009 All-Seeing Interactive. All rights reserved.
View
2  Classes/ASIS3BucketObject.m
@@ -1,6 +1,6 @@
//
// ASIS3BucketObject.m
-// Mac
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 13/07/2009.
// Copyright 2009 All-Seeing Interactive. All rights reserved.
View
2  Classes/ASIS3ListRequest.h
@@ -1,6 +1,6 @@
//
// ASIS3ListRequest.h
-// Mac
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 13/07/2009.
// Copyright 2009 All-Seeing Interactive. All rights reserved.
View
2  Classes/ASIS3ListRequest.m
@@ -1,6 +1,6 @@
//
// ASIS3ListRequest.m
-// Mac
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 13/07/2009.
// Copyright 2009 All-Seeing Interactive. All rights reserved.
View
1  Classes/ASIS3Request.h
@@ -1,5 +1,6 @@
//
// ASIS3Request.h
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 30/06/2009.
// Copyright 2009 All-Seeing Interactive. All rights reserved.
View
1  Classes/ASIS3Request.m
@@ -1,5 +1,6 @@
//
// ASIS3Request.m
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 30/06/2009.
// Copyright 2009 All-Seeing Interactive. All rights reserved.
View
2  Classes/Tests/ASIFormDataRequestTests.h
@@ -1,6 +1,6 @@
//
// ASIFormDataRequestTests.h
-// asi-http-request
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 08/11/2008.
// Copyright 2008 All-Seeing Interactive. All rights reserved.
View
2  Classes/Tests/ASIFormDataRequestTests.m
@@ -1,6 +1,6 @@
//
// ASIFormDataRequestTests.m
-// asi-http-request
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 08/11/2008.
// Copyright 2008 All-Seeing Interactive. All rights reserved.
View
2  Classes/Tests/ASIHTTPRequestTests.h
@@ -1,6 +1,6 @@
//
// ASIHTTPRequestTests.h
-// asi-http-request
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 01/08/2008.
// Copyright 2008 All-Seeing Interactive. All rights reserved.
View
2  Classes/Tests/ASIHTTPRequestTests.m
@@ -1,6 +1,6 @@
//
// ASIHTTPRequestTests.m
-// asi-http-request
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 01/08/2008.
// Copyright 2008 All-Seeing Interactive. All rights reserved.
View
2  Classes/Tests/ASINetworkQueueTests.h
@@ -1,6 +1,6 @@
//
// ASINetworkQueueTests.h
-// asi-http-request
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 08/11/2008.
// Copyright 2008 All-Seeing Interactive. All rights reserved.
View
2  Classes/Tests/ASINetworkQueueTests.m
@@ -1,6 +1,6 @@
//
// ASINetworkQueueTests.m
-// asi-http-request
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 08/11/2008.
// Copyright 2008 All-Seeing Interactive. All rights reserved.
View
2  Classes/Tests/ASIS3RequestTests.h
@@ -1,6 +1,6 @@
//
// ASIS3RequestTests.h
-// asi-http-request
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 12/07/2009.
// Copyright 2009 All-Seeing Interactive. All rights reserved.
View
2  Classes/Tests/ASIS3RequestTests.m
@@ -1,6 +1,6 @@
//
// ASIS3RequestTests.m
-// asi-http-request
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 12/07/2009.
// Copyright 2009 All-Seeing Interactive. All rights reserved.
View
2  Classes/Tests/ASITestCase.h
@@ -1,6 +1,6 @@
//
// ASITestCase.h
-// iPhone
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 26/07/2009.
// Copyright 2009 All-Seeing Interactive. All rights reserved.
View
2  Classes/Tests/ASITestCase.m
@@ -1,6 +1,6 @@
//
// ASITestCase.m
-// iPhone
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 26/07/2009.
// Copyright 2009 All-Seeing Interactive. All rights reserved.
View
4 Classes/Tests/PerformanceTests.h
@@ -1,12 +1,12 @@
//
// PerformanceTests.h
-// Mac
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 17/12/2009.
// Copyright 2009 All-Seeing Interactive. All rights reserved.
//
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
#import "ASITestCase.h"
@interface PerformanceTests : ASITestCase {
View
2  Classes/Tests/PerformanceTests.m
@@ -1,6 +1,6 @@
//
// PerformanceTests.m
-// Mac
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 17/12/2009.
// Copyright 2009 All-Seeing Interactive. All rights reserved.
View
2  Classes/Tests/ProxyTests.h
@@ -1,6 +1,6 @@
//
// ProxyTests.h
-// Mac
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 02/08/2009.
// Copyright 2009 All-Seeing Interactive. All rights reserved.
View
2  Classes/Tests/ProxyTests.m
@@ -1,6 +1,6 @@
//
// ProxyTests.m
-// Mac
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 02/08/2009.
// Copyright 2009 All-Seeing Interactive. All rights reserved.
View
2  Classes/Tests/StressTests.h
@@ -1,6 +1,6 @@
//
// StressTests.h
-// iPhone
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 30/10/2009.
// Copyright 2009 All-Seeing Interactive. All rights reserved.
View
2  Classes/Tests/StressTests.m
@@ -1,6 +1,6 @@
//
// StressTests.m
-// iPhone
+// Part of ASIHTTPRequest -> http://allseeing-i.com/ASIHTTPRequest
//
// Created by Ben Copsey on 30/10/2009.
// Copyright 2009 All-Seeing Interactive. All rights reserved.
Please sign in to comment.
Something went wrong with that request. Please try again.