Commit 12cac066e603de1f76be132a997b1ee18f4b2bfd
Exists in
master
Merge branch 'master' of http://gitlab.sanlien.com.tw/tom/git_test
Conflicts: changeLog.txt licence.txt
Showing
3 changed files
Show diff stats
changeLog.txt
| 1 | fdfshsj | ||
| 2 | htehtrjj | ||
| 3 | getjryrl | ||
| 4 | fjfsykiy8 |
licence.txt
| 1 | ********************************************************************************* | 1 | |
| 2 | This AmCharts software is free under a linkware license. | 2 | |
| 3 | 3 | ||
| 4 | This means you may not remove or hide in any other way link to amcharts | 4 | |
| 5 | web site - www.amcharts.com. | 5 | |
| 6 | 6 | ||
| 7 | If you wish to remove the link, you should purchase commercial license. | 7 | |
| 8 | 8 | ||
| 9 | You may not redistribute, sublicense or sell this program without written | 9 | |
| 10 | permission of Antanas Marcelionis, the author of amcharts software. | 10 | |
| 11 | 11 | ||
| 12 | This software is provided without warranty. | 12 | |
| 13 | ********************************************************************************* | 13 | |
| 14 | A commercial version (without link) is available at amCharts's website: | 14 | |
| 15 | http://shop.amcharts.com/ | 15 | |
| 16 | ********************************************************************************* | ||
| 17 | aaa | ||
| 18 | bbb | ||
| 16 | ********************************************************************************* | ||
| 17 | This AmCharts software is free under a linkware license. | ||
| 18 | |||
| 19 | This means you may not remove or hide in any other way link to amcharts | ||
| 20 | web site - www.amcharts.com. | ||
| 21 | |||
| 22 | If you wish to remove the link, you should purchase commercial license. | ||
| 23 | |||
| 24 | You may not redistribute, sublicense or sell this program without written | ||
| 25 | permission of Antanas Marcelionis, the author of amcharts software. | ||
| 26 | |||
| 27 | This software is provided without warranty. | ||
| 28 | ********************************************************************************* | ||
| 29 | A commercial version (without link) is available at amCharts's website: | ||
| 30 | http://shop.amcharts.com/ | ||
| 31 | ********************************************************************************* | ||
| 32 | |||
| 33 | <<<<<<< .mine | ||
| 34 | ********************************************************************************* | ||
| 35 | This AmCharts software is free under a linkware license. | ||
| 36 | |||
| 37 | This means you may not remove or hide in any other way link to amcharts | ||
| 38 | web site - www.amcharts.com. | ||
| 39 | |||
| 40 | If you wish to remove the link, you should purchase commercial license. | ||
| 41 | |||
| 42 | You may not redistribute, sublicense or sell this program without written | ||
| 43 | permission of Antanas Marcelionis, the author of amcharts software. | ||
| 44 | |||
| 45 | This software is provided without warranty. | ||
| 46 | ********************************************************************************* | ||
| 47 | A commercial version (without link) is available at amCharts's website: | ||
| 48 | http://shop.amcharts.com/ | ||
| 49 | ********************************************************************************* | ||
| 50 | aaa | ||
| 51 | bbb | ||
| 52 | ======= | ||
| 53 | ********************************************************************************* | ||
| 54 | This AmCharts software is free under a linkware license. | ||
| 55 | |||
| 56 | This means you may not remove or hide in any other way link to amcharts | ||
| 57 | web site - www.amcharts.com. | ||
| 58 | |||
| 59 | If you wish to remove the link, you should purchase commercial license. | ||
| 60 | |||
| 61 | You may not redistribute, sublicense or sell this program without written | ||
| 62 | permission of Antanas Marcelionis, the author of amcharts software. | ||
| 63 | |||
| 64 | This software is provided without warranty. | ||
| 65 | ********************************************************************************* | ||
| 66 | A commercial version (without link) is available at amCharts's website: | ||
| 67 | http://shop.amcharts.com/ | ||
| 68 | ********************************************************************************* | ||
| 69 |
thirdPartySoftwareList.txt
| File was created | 1 | ********************************************************************************* | |
| 2 | Third party software used: | ||
| 3 | |||
| 4 | Jason S. Kerchner base class (http://livingmachines.net) | ||
| 5 | Licensed under BSD license: http://livingmachines.net/license/ | ||
| 6 | |||
| 7 | David Knape & Patrick Mineault Bezier curves drawing logic. | ||
| 8 | |||
| 9 | Code optimization made using Closure Compiling service: | ||
| 10 | http://closure-compiler.appspot.com/home | ||
| 11 | |||
| 12 | Libraries used for exporting charts as image/pdf/svg: | ||
| 13 | |||
| 14 | canvg.js - Javascript SVG parser and renderer on Canvas | ||
| 15 | MIT Licensed | ||
| 16 | Gabe Lerner (gabelerner@gmail.com) | ||
| 17 | http://code.google.com/p/canvg/ | ||
| 18 | |||
| 19 | rgbcolor.js | ||
| 20 | A class to parse color values | ||
| 21 | author Stoyan Stefanov, sstoo@gmail.com | ||
| 22 | http://www.phpied.com/rgb-color-parser-in-javascript/ | ||
| 23 | license Use it if you like it | ||
| 24 | |||
| 25 | FileSaver.js | ||
| 26 | A saveAs() FileSaver implementation. | ||
| 27 | By Eli Grey, http://eligrey.com | ||
| 28 | License: X11/MIT | ||
| 29 | |||
| 30 | jsPDF.js | ||
| 31 | By James Hall | ||
| 32 | License: MIT | ||
| 33 | |||
| 34 | ********************************************************************************* |