Changeset 12167 for freepbx/trunk/CONTRIB.txt

Timestamp:

05/16/11 20:29:39 (1 year ago)

Author:

p_lindheimer

Message:

Merged revisions 11124-11125,11128-11133,11135,11137,11145-11147,11149,11166,11168,11216,11228-11229,11240-11241,11243-11244,11255,11263-11264,11272,11278,11280,11282,11285,11291-11293,11300,11302,11321,11334,11339-11343,11352,11363-11364,11366,11368,11382-11384,11388-11390,11399,11405-11406,11421,11449,11453-11460,11462-11464,11471,11482,11485-11487,11493-11494,11498,11502,11504,11528,11530,11535,11543,11555,11558,11574-11576,11579,11581,11583,11585-11587,11589,11591-11592,11599,11622,11629,11631,11633,11637-11639,11641,11652,11662-11663,11666,11668,11671-11672,11675-11676,11704,11711,11714,11719,11721,11723,11725-11726,11732,11755,11760,11762-11764,11767,11769-11770,11772-11774,11796,11799-11800,11805,11807,11810,11812,11818,11822,11826,11828,11830,11841-11842,11853-11855,11891-11892,11900,11928,11931,11937-11940,11944,11954,11960,11968,11971-11974,11986-11987,12016,12021-12022,12024,12036-12037,12044-12046,12056,12061,12066,12068,12073,12076,12154-12156 via svnmerge from

Merged 2.9 branch to trunk.

Files:

• freepbx/trunk (modified) (1 prop)
• freepbx/trunk/CONTRIB.txt (modified) (3 diffs)

freepbx/trunk/CONTRIB.txt

@@ -23 +23 @@
-Flash Operator Panel is GPL (see above)
-
-ás Gudiñ
+ás Gudiñ
-
-*******************************************************************************************
@@ -53 +53 @@
-
-*******************************************************************************************
-jsmin.rb
-
-Author: Uladzislau Latynski
-This work is a translation from C to Ruby of jsmin.c published by
-Douglas Crockford.  Permission is hereby granted to use the Ruby
-version under the same conditions as the jsmin.c on which it is
-based.
-
-Licensing: see source code - all permissions to reproduce granted
-
-*******************************************************************************************
-jquery.dimensions 1.0rc1
-Dual License MIT and GPL (based off of jQuery above)
@@ -77 +66 @@
-license   http://opensource.org/licenses/mit-license.php MIT License
-version   2.0.1.0064 (2010-09-30)
+
+*******************************************************************************************
+Codeigniter helpers/librarires:
+Copyright (c) 2008 - 2011, EllisLab, Inc.
+All rights reserved.
+license http://codeigniter.com/user_guide/license.html
+
+*******************************************************************************************
+Credits/License for music included in this package
+------------------------------------------
+macroform-cold_day - Paul Shuler (Macroform)
+paulshuler@gmail.com - http://macroform.bandcamp.com/
+
+macroform-robot_dity - Paul Shuler (Macroform)
+paulshuler@gmail.com - http://macroform.bandcamp.com/
+
+macroform-the_simplicity - Paul Shuler (Macroform)
+paulshuler@gmail.com - http://macroform.bandcamp.com/
+
+manolo_camp-morning_coffee - Manolo Camp
+beatbastard@gmx.net - http://ccmixter.org/people/ManoloCamp
+
+reno_project-system - Reno Project
+renoproject@hotmail.com - http://www.jamendo.com/en/album/23661
+
+These files are distributed under the Creative Commons Attribution-ShareAlike
+3.0 license through explicit permission from their authors.
+
+The license can be found at:
+http://creativecommons.org/licenses/by-sa/3.0/