Viewing all changes in revision 12.
- Committer: gustav.hartvigsson at gmail
- Date: 2013-04-04 06:42:25 UTC
- mfrom: (4.7.13 GammaBear)
- Revision ID: gustav.hartvigsson@gmail.com-20130404064225-jxssrfawo202of2s
fixed a few conflicts, removes some files to do so among other things.
- files added:
- Code Viewer Alt/.DS_Store
- media/codeviewer
- files removed:
- Code Viewer Alt/AJAX/AjaxDemoApp0_getCustomer.htm
- Code Viewer Alt/css
- CodeViewer/Codeviewer
- DuggaSys/changePassword/css
- DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/bak_dugga1_bits_1/css
- DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/bak_dugga1_bits_1/dugga_checklogin.php
- DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/bak_dugga1_bits_1/js
- DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/bak_dugga1_colors_1/css
- DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/bak_dugga1_colors_1/js
- DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_bits_1/css
- DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_bits_1/js
- DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_bits_2/css
- DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_bits_2/dugga1_bits_1/css
- DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_bits_2/dugga1_bits_1/js
- DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_bits_2/js
- DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_colors_1/css
- DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_colors_1/js
- DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_colors_1/js/jquery-1.8.0.min.js
- DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_colors_2/css
- DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_colors_2/js
- DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_colors_2/js/jquery-1.8.0.min.js
- DuggaSys/duggor/Dugga 2 Datorgrafik - Geometri/dugga2_geometri_1/css
- DuggaSys/duggor/Dugga 2 Datorgrafik - Geometri/dugga2_geometri_1/js
- DuggaSys/duggor/Dugga 2 Datorgrafik - Geometri/dugga2_geometri_2/css
- DuggaSys/duggor/Dugga 2 Datorgrafik - Geometri/dugga2_geometri_2/js
- DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/css
- DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/dugga3_transf_1/css
- DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/dugga3_transf_1/js
- DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/dugga3_transf_2/css
- DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/dugga3_transf_2/js
- DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/js
- DuggaSys/duggor/Dugga 4 Datorgrafik - 3D och Koordinater/includes
- DuggaSys/quizAjax/css
- DuggaSys/quizAjax/js
- DuggaSys/quizSystem/css
- DuggaSys/quizSystem/js
- files renamed:
- CodeViewer/Codeviewer/showcode.css => CodeViewer/codeviewer.css
- CodeViewer/Codeviewer/showcode.js => CodeViewer/codeviewer.js *
- CodeViewer/Codeviewer/showsource.php => CodeViewer/codeviewer.php
- CodeViewer/Codeviewer/showcode.php => CodeViewer/codeviewerfunctions.php
- DuggaSys/duggor/Dugga Databassystem - ER Modellering Test/canvas_ER_demo.html => DuggaSys/duggor/Dugga Databassystem - ER Modellering Test/canvas_ER_demo.js
- WebGL and Benchmarking/Test1ShaderStartup.html => WebGL and Benchmarking/test1shaderstartup.html
- ErModeller/jquery.js => js/jquery.js
- CodeViewer/Codeviewer/CodeViewerDescareaBack.png => media/codeviewer/CodeViewerDescareaBack.png *
- CodeViewer/Codeviewer/CodeViewerDownloadbutton.png => media/codeviewer/CodeViewerDownloadbutton.png *
- CodeViewer/Codeviewer/CodeViewerLeftbutton.png => media/codeviewer/CodeViewerLeftbutton.png *
- CodeViewer/Codeviewer/CodeViewerLeftbuttonGrayed.png => media/codeviewer/CodeViewerLeftbuttonGrayed.png *
- CodeViewer/Codeviewer/CodeViewerMenuareaBack.png => media/codeviewer/CodeViewerMenuareaBack.png *
- CodeViewer/Codeviewer/CodeViewerRightbutton.png => media/codeviewer/CodeViewerRightbutton.png *
- files modified:
- Code Viewer Alt/AJAX/AjaxDemoApp0_getCustomer.php
expand all
collapse all
added
removed
