Merge branch 'afh/master'

couchbaselabs · May 18, 2011 · af028b3 · af028b3
2 parents 054d67c + 26e5f90
commit af028b3
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 0 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -0,0 +1,13 @@
+Copyright 2011 Alexis Hildebrandt
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/OnTheSpot/DetailViewController.h b/OnTheSpot/DetailViewController.h
@@ -4,6 +4,7 @@
 //
 //  Created by afh on 19/04/11.
 //  Copyright 2011 Alexis Hildebrandt. All rights reserved.
+//  See LICENSE.txt for details.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/OnTheSpot/DetailViewController.m b/OnTheSpot/DetailViewController.m
@@ -4,6 +4,7 @@
 //
 //  Created by afh on 19/04/11.
 //  Copyright 2011 Alexis Hildebrandt. All rights reserved.
+//  See LICENSE.txt for details.
 //
 
 #import "DetailViewController.h"

diff --git a/OnTheSpot/OnTheSpotAppDelegate.h b/OnTheSpot/OnTheSpotAppDelegate.h
@@ -4,6 +4,7 @@
 //
 //  Created by afh on 19/04/11.
 //  Copyright 2011 Alexis Hildebrandt. All rights reserved.
+//  See LICENSE.txt for details.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/OnTheSpot/OnTheSpotAppDelegate.m b/OnTheSpot/OnTheSpotAppDelegate.m
@@ -4,6 +4,7 @@
 //
 //  Created by afh on 19/04/11.
 //  Copyright 2011 Alexis Hildebrandt. All rights reserved.
+//  See LICENSE.txt for details.
 //
 
 #import "OnTheSpotAppDelegate.h"

diff --git a/OnTheSpot/RootViewController.h b/OnTheSpot/RootViewController.h
@@ -4,6 +4,7 @@
 //
 //  Created by afh on 19/04/11.
 //  Copyright 2011 Alexis Hildebrandt. All rights reserved.
+//  See LICENSE.txt for details.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/OnTheSpot/RootViewController.m b/OnTheSpot/RootViewController.m
@@ -5,6 +5,7 @@
 //  Created by afh on 19/04/11.
 //  Couchbase and JSON work 14/05/11 Chris Anderson
 //  Copyright 2011 Alexis Hildebrandt. All rights reserved.
+//  See LICENSE.txt for details.
 //
 
 #import "RootViewController.h"

diff --git a/OnTheSpot/main.m b/OnTheSpot/main.m
@@ -4,6 +4,7 @@
 //
 //  Created by afh on 19/04/11.
 //  Copyright 2011 Alexis Hildebrandt. All rights reserved.
+//  See LICENSE.txt for details.
 //
 
 #import <UIKit/UIKit.h>