Author: lindner
Date: Tue Dec 9 12:38:29 2008
New Revision: 724875
URL: http://svn.apache.org/viewvc?rev=724875&view=rev
Log:
Merge license fix from trunk
Modified:
incubator/shindig/branches/1.0.x-incubating/ (props changed)
incubator/shindig/branches/1.0.x-incubating/features/opensocial-0.6/opensocial6to7.js
incubator/shindig/branches/1.0.x-incubating/features/opensocial-0.7/opensocial7to8.js
Propchange: incubator/shindig/branches/1.0.x-incubating/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 9 12:38:29 2008
@@ -1 +1 @@
-/incubator/shindig/trunk:724511-724522
+/incubator/shindig/trunk:724511-724522,724874
Modified:
incubator/shindig/branches/1.0.x-incubating/features/opensocial-0.6/opensocial6to7.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/features/opensocial-0.6/opensocial6to7.js?rev=724875&r1=724874&r2=724875&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/features/opensocial-0.6/opensocial6to7.js
(original)
+++
incubator/shindig/branches/1.0.x-incubating/features/opensocial-0.6/opensocial6to7.js
Tue Dec 9 12:38:29 2008
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
// If a gadget was written for the opensocial 0.6 apis and it wants to run in a
// container that only supports 0.7, including this file should allow the
gadget
// to run without making any changes.
Modified:
incubator/shindig/branches/1.0.x-incubating/features/opensocial-0.7/opensocial7to8.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/features/opensocial-0.7/opensocial7to8.js?rev=724875&r1=724874&r2=724875&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/features/opensocial-0.7/opensocial7to8.js
(original)
+++
incubator/shindig/branches/1.0.x-incubating/features/opensocial-0.7/opensocial7to8.js
Tue Dec 9 12:38:29 2008
@@ -1,4 +1,22 @@
-// stub javascript
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
opensocial.Activity.MediaItem = opensocial.MediaItem
opensocial.newActivityMediaItem = opensocial.newMediaItem;
