Permalink
Browse files

Merge branch 'version-1.1'

  • Loading branch information...
2 parents 58a2e40 + 78fca78 commit 36a1957e202616ddc77afb4aa0f7ae91e52a0562 @raphaelbauer committed Jan 21, 2012
Showing with 19 additions and 0 deletions.
  1. +19 −0 COPYING
View
@@ -0,0 +1,19 @@
+Copyright 2012
+
+ Raphael Bauer (http://www.raphaelbauer.com)
+ Dominc Jansen (dominc.jansen@finalfrontierlabs.com)
+ Nico Guettler (nico.guettler@finalfrontierlabs.com)
+
+ FinalFrontierLabs (http://www.finalfrontierlabs.com)
+
+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.

0 comments on commit 36a1957

Please sign in to comment.