Alexander Sadleir | 1 | <<<<<<< HEAD | |
2 | [submodule "js/flotr2"] | ||
3 | path = js/flotr2 | ||
4 | url = https://github.com/HumbleSoftware/Flotr2.git | ||
5 | [submodule "js/FlashCanvas"] | ||
6 | path = js/FlashCanvas | ||
Maxious | 7 | url = https://github.com/timcameronryan/FlashCanvas | |
8 | ======= | ||
9 | [submodule "lib/amon-php"] | ||
Maxious | 10 | path = lib/amon-php | |
11 | url = https://github.com/martinrusev/amon-php.git | ||
Maxious | 12 | [submodule "js/yepnope"] | |
Maxious | 13 | path = js/yepnope | |
14 | url = https://github.com/SlexAxton/yepnope.js.git | ||
Maxious | 15 | >>>>>>> 9714b3c938ad66f914c8d22144b8883e40f2ef09 | |
16 |