Merge lp:~a11andoh/lenasys/copyrights into lp:lenasys

[Anders Ohlson]

=== modified file 'codeigniter/img/COPYING'
--- codeigniter/img/COPYING	2013-05-30 12:50:06 +0000
+++ codeigniter/img/COPYING	2013-05-31 06:26:25 +0000
@@ -12,12 +12,23 @@
 
 FILENAME : AUTHOR
 foo/bar.png : John Doe (This is an example)
-
-
-
-
-
-
+biglogo.png : Anders Ohlson
+filetree_example_indicator.png : Anders Ohlson
+filetree_quiz_indicator.png : Anders Ohlson
+minus_button.png : Anders Ohlson
+movearrow_down_button.png : Anders Ohlson
+movearrow_up_button.png : Anders Ohlson
+noborder_pencil_edit_button.png : Anders Ohlson
+pencil_edit_button.png : Anders Ohlson
+plusbutton.png : Anders Ohlson
+small_minus_button.png : Anders Ohlson
+bannermenu_bg.png : Emma Jonsson
+icomoon_checkmark.png : Emma Jonsson
+logo.png : Emma Jonsson
+logo_button.png : Emma Jonsson
+user_menu_button.png : Emma Jonsson
+filetree_expanded_arrow.png : Emma Jonsson
+filetree_expanded_dot.png : Emma Jonsson
 
 
  EXCLUDED FILES

=== added directory 'documentation'
=== added file 'documentation/COPYING'
--- documentation/COPYING	1970-01-01 00:00:00 +0000
+++ documentation/COPYING	2013-05-31 06:26:25 +0000
@@ -0,0 +1,32 @@
+ COPYING
+
+The MEDIA FILES (The files in this folder) is property of their respective
+owners and is available and the following files are available under the
+Creative Commons Attribution-ShareAlike 3.0 Unported licence (available at
+http://creativecommons.org/licenses/by-sa/3.0/). Files excluded from this
+license are listed in the section EXCLUDED FILES.
+
+A copying Creative Commons Attribution-ShareAlike 3.0 Unported is available in
+the file CC-BY-SA-3-0.
+
+
+FILENAME : AUTHOR
+foo/bar.png : John Doe (This is an example)
+mockups.rar : Anders Ohlson & Emma Jonsson
+
+
+
+
+
+
+
+ EXCLUDED FILES
+ 
+icomoon.ttf : Licensing information available at http://icomoon.io and
+   https://github.com/Keyamoon/IcoMoon--limited-/blob/master/License.txt
+
+OpenSans-Regular.ttf and OpenSans-Semibold.ttf : Licensing information available
+   at http://opensans.com and http://www.apache.org/licenses/LICENSE-2.0.html
+
+
+

=== added file 'documentation/Mockups.rar'
Binary files documentation/Mockups.rar	1970-01-01 00:00:00 +0000 and documentation/Mockups.rar	2013-05-31 06:26:25 +0000 differ