Add @oakho to list of contributors, and reassign copyright of entire library to include both Marcus Westin and Antoine Lagadec.

marcuswestin · marcuswestin · commit 6a5cb6530175 · 2013-04-23T18:28:28.000-07:00
diff --git a/Example Apps/ExampleApp-OSX/AppDelegate.h b/Example Apps/ExampleApp-OSX/AppDelegate.h
@@ -1,11 +1,3 @@
-//
-//  AppDelegate.h
-//  ExampleApp-OSX
-//
-//  Created by Antoine Lagadec on 07/04/13.
-//  Copyright (c) 2013 Antoine Lagadec. All rights reserved.
-//
-
 #import <Cocoa/Cocoa.h>
 #import "WebViewJavascriptBridge_OSX.h"
 
diff --git a/Example Apps/ExampleApp-OSX/AppDelegate.m b/Example Apps/ExampleApp-OSX/AppDelegate.m
@@ -1,11 +1,3 @@
-//
-//  AppDelegate.m
-//  ExampleApp-OSX
-//
-//  Created by Antoine Lagadec on 07/04/13.
-//  Copyright (c) 2013 Antoine Lagadec. All rights reserved.
-//
-
 #import "AppDelegate.h"
 
 @implementation AppDelegate
diff --git a/Example Apps/ExampleApp-OSX/ExampleApp-OSX-Info.plist b/Example Apps/ExampleApp-OSX/ExampleApp-OSX-Info.plist
@@ -25,7 +25,7 @@
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2013 Antoine Lagadec. All rights reserved.</string>
+	<string>Copyright © 2013 Marcus Westin, Antoine Lagadec. All rights reserved.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
diff --git a/Example Apps/ExampleApp-OSX/main.m b/Example Apps/ExampleApp-OSX/main.m
@@ -1,11 +1,3 @@
-//
-//  main.m
-//  ExampleApp-OSX
-//
-//  Created by Antoine Lagadec on 07/04/13.
-//  Copyright (c) 2013 Antoine Lagadec. All rights reserved.
-//
-
 #import <Cocoa/Cocoa.h>
 
 int main(int argc, char *argv[])
diff --git a/Example Apps/ExampleApp-iOS/main.m b/Example Apps/ExampleApp-iOS/main.m
@@ -1,11 +1,3 @@
-//
-//  main.m
-//  ExampleApp
-//
-//  Created by Marcus Westin on 9/13/12.
-//  Copyright (c) 2012 Marcus Westin. All rights reserved.
-//
-
 #import <UIKit/UIKit.h>
 
 #import "ExampleAppDelegate.h"
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011 Marcus Westin
+Copyright (c) 2011-2013 Marcus Westin, Antoine Lagadec
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
diff --git a/README.md b/README.md
@@ -191,8 +191,8 @@ WebViewJavascriptBridge uses `NSJSONSerialization` by default. If you need iOS 4
 
 Contributors
 ------------
-
-- [@marcuswestin](https://github.com/marcuswestin) Marcus Westin
+- [@marcuswestin](https://github.com/marcuswestin) Marcus Westin (Author)
+- [@oakho](https://github.com/oakho) Antoine Lagadec (OS X version)
 - [@psineur](https://github.com/psineur) Stepan Generalov
 - [@sergiocampama](https://github.com/sergiocampama) Sergio Campamá
 - [@stringbean](https://github.com/stringbean) Michael Stringer
diff --git a/WebViewJavascriptBridge_OSX/WebViewJavascriptBridge_OSX.h b/WebViewJavascriptBridge_OSX/WebViewJavascriptBridge_OSX.h
@@ -1,11 +1,3 @@
-//
-//  WebViewJavascriptBridge+OSX.h
-//  ExampleApp-OSX
-//
-//  Created by Antoine Lagadec on 07/04/13.
-//  Copyright (c) 2013 Antoine Lagadec. All rights reserved.
-//
-
 #import <WebKit/WebKit.h>
 #import "WebViewJavascriptBridgeAbstract.h"
 
diff --git a/WebViewJavascriptBridge_OSX/WebViewJavascriptBridge_OSX.m b/WebViewJavascriptBridge_OSX/WebViewJavascriptBridge_OSX.m
@@ -1,11 +1,3 @@
-//
-//  WebViewJavascriptBridge+OSX.m
-//  ExampleApp-OSX
-//
-//  Created by Antoine Lagadec on 07/04/13.
-//  Copyright (c) 2013 Antoine Lagadec. All rights reserved.
-//
-
 #import "WebViewJavascriptBridge_OSX.h"
 
 @implementation WebViewJavascriptBridge
diff --git a/WebViewJavascriptBridge_iOS/WebViewJavascriptBridge_iOS.h b/WebViewJavascriptBridge_iOS/WebViewJavascriptBridge_iOS.h
@@ -1,11 +1,3 @@
-//
-//  WebViewJavascriptBridge+iOS.h
-//  ExampleApp-iOS
-//
-//  Created by Antoine Lagadec on 07/04/13.
-//  Copyright (c) 2013 Marcus Westin. All rights reserved.
-//
-
 #import <UIKit/UIKit.h>
 #import "WebViewJavascriptBridgeAbstract.h"
 
diff --git a/WebViewJavascriptBridge_iOS/WebViewJavascriptBridge_iOS.m b/WebViewJavascriptBridge_iOS/WebViewJavascriptBridge_iOS.m
@@ -1,11 +1,3 @@
-//
-//  WebViewJavascriptBridge+iOS.m
-//  ExampleApp-iOS
-//
-//  Created by Antoine Lagadec on 07/04/13.
-//  Copyright (c) 2013 Marcus Westin. All rights reserved.
-//
-
 #import "WebViewJavascriptBridge_iOS.h"
 
 @implementation WebViewJavascriptBridge

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2011 Marcus Westin`
	`1`	`+Copyright (c) 2011-2013 Marcus Westin, Antoine Lagadec`
`2`	`2`
`3`	`3`	`Permission is hereby granted, free of charge, to any person`
`4`	`4`	`obtaining a copy of this software and associated documentation`