To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/lenasys/0.1
« back to all changes in this revision
Viewing changes to WebGL and Benchmarking/test1shaderstartup.css
-
Committer:
galaxyAbstractor
-
Date:
2013-04-03 11:50:24 UTC
-
mfrom:
(8.2.4 lenasys)
-
mto:
(4.7.12 GammaBear)
-
mto:
This revision was merged to the branch mainline in
revision
12.
-
Revision ID:
galaxyabstractor@gmail.com-20130403115024-f3myj3ycy1xsnl55
Merged Daniels stuff
------------- This line and the following will be ignored --------------
removed:
trunk/
trunk/Code Viewer Alt/.DS_Store
trunk/CodeViewer/.DS_Store
trunk/CodeViewer/DomExample3b/.DS_Store
trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/.DS_Store
trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_bits_1/.DS_Store
trunk/DuggaSys/duggor/Dugga 1 Datorgrafik - Bithantering och Farger/dugga1_colors_1/.DS_Store
trunk/DuggaSys/duggor/Dugga 2 Datorgrafik - Geometri/.DS_Store
trunk/DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/.DS_Store
trunk/DuggaSys/duggor/Dugga 4 Datorgrafik - 3D och Koordinater/.DS_Store
trunk/Widget Library/SliderDemo.html
added:
Code Tokenizer and Parser/Parser_Test.js
Code Viewer Alt/css/
Code Viewer Alt/css/style.css
ErModeller/canvas.css
ErModeller/canvas.js
WebGL and Benchmarking/test1shaderstartup.css
Widget Library/sliderdemo.css
Widget Library/sliderdemo.html
Widget Library/sliderdemo.js
css/
etc/
js/
media/
php/
renamed:
trunk/Code Tokenizer and Parser/ => Code Tokenizer and Parser/
trunk/Code Viewer Alt/ => Code Viewer Alt/
trunk/CodeViewer/ => CodeViewer/
trunk/DuggaSys/ => DuggaSys/
trunk/ErModeller/ => ErModeller/
trunk/ErModeller/jquery.js => js/jquery.js
trunk/ObjConv/ => ObjConv/
trunk/WebGL and Benchmarking/ => WebGL and Benchmarking/
trunk/WebGL and Benchmarking/Test1ShaderStartup.html => WebGL and Benchmarking/test1shaderstartup.html
trunk/Widget Library/ => Widget Library/
trunk/svg Converter/ => svg Converter/
modified:
Code Tokenizer and Parser/Parser_Test.html
Code Viewer Alt/AJAX/AjaxDemoApp0_getCustomer.php
Code Viewer Alt/AJAX/AjaxDemoApp10_getClicks.php
Code Viewer Alt/AJAX/AjaxDemoApp1_storeCustomer.php
Code Viewer Alt/AJAX/AjaxDemoApp2_getCustomerBookings.php
Code Viewer Alt/AJAX/AjaxDemoApp3_getResources.php
Code Viewer Alt/AJAX/AjaxDemoApp4_getBookingsForDate.php
Code Viewer Alt/AJAX/AjaxDemoApp5_showBookings.php
Code Viewer Alt/AJAX/AjaxDemoApp6_makeBookings.php
Code Viewer Alt/AJAX/AjaxDemoApp7_makeBookingsTimer.php
Code Viewer Alt/AJAX/AjaxDemoApp8_getResourceAvailability.php
Code Viewer Alt/AJAX/AjaxDemoApp9_makeClick.php
Code Viewer Alt/Codeviewer/showcode.css
Code Viewer Alt/Codeviewer/showcode.js
Code Viewer Alt/Codeviewer/showcode.php
Code Viewer Alt/Codeviewer/showsource.php
Code Viewer Alt/index.html
ErModeller/canvas_ER_demo_duggajs.html
svg Converter/SVG_TO_CANVAS_III.php
svg Converter/SVG_httpAjax.js*
svg Converter/index.php
WebGL and Benchmarking/test1shaderstartup.html
pending merges:
Daniel Johansson 2013-04-03 Extracted ./ErModeller/jquery.js to ./js/jqu...
Daniel Johansson 2013-04-03 Added doctype
Daniel Johansson 2013-04-03 [merge] Broken out CSS and JavaScript fr...
Gustav Hartvigsson 2013-04-03 [merge] Merged the new structure.
Elof Bigestans 2013-04-03 Added new folders to match new folder stru...
Daniel Johansson 2013-04-03 Broken out inline CSS in WebGL
Gustav Hartvigsson 2013-04-02 [merge] Mergerd fix for the widget lib...
Elof Bigestans 2013-04-02 Added relevant files
Elof Bigestans 2013-04-02 * Solved Bug #1161446 and
Gustav Hartvigsson 2013-04-02 [merge] derp.
Erik Wikström 2013-03-28 removed .DS_Store
Erik Wikström 2013-03-28 Removed trunk folder and moved its contents...
Gustav Hartvigsson 2013-04-02 [merge] Merged stuff.
Gustav Hartvigsson 2013-04-02 [merge] Merge from implemenation group...
mattman-03 2013-04-02 [merge] i11johan klar med städning
i11johan 2013-04-02 Converted to new codestandard.
i11johan 2013-03-28 Converted the code to the defined codestandard t...
mattman-03 2013-04-02 [merge] mattman-03 färdig med städning
mattman-03 2013-04-02 Städat färdigt
mattman-03 2013-04-02 [merge] c11emian klar med städa
c11emian 2013-04-02 Fixed the indentation in Parser_Test.js
c11emian 2013-03-28 I have begun to fix the javascript so that it co...
mattman-03 2013-03-28 [merge] mattman-03 merged
mattman-03 2013-03-28 clean up after dirty bird
mattman-03 2013-03-28 [merge] wikxen merged
Erik Wikström 2013-03-28 Fixed codeformat and added doctype
mattman-03 2013-03-28 [merge] merged a11vikob
a11vikob 2013-03-28 Indentation etc fixed
a11vikob 2013-03-28 Added css-file too
a11vikob 2013-03-28 In "Code Viewer Alt":
mattman-03 2013-03-28 [merge] Merged c11emian.
c11emian 2013-03-28 Added <head> and <title> tags
- files renamed:
-
trunk/Code Tokenizer and Parser/
=>
Code Tokenizer and Parser/
-
trunk/Code Viewer Alt/
=>
Code Viewer Alt/
-
trunk/CodeViewer/
=>
CodeViewer/
-
trunk/DuggaSys/
=>
DuggaSys/
-
trunk/ErModeller/
=>
ErModeller/
-
trunk/ObjConv/
=>
ObjConv/
-
trunk/WebGL and Benchmarking/
=>
WebGL and Benchmarking/
-
trunk/Widget Library/
=>
Widget Library/
-
trunk/ErModeller/jquery.js
=>
js/jquery.js
-
trunk/svg Converter/
=>
svg Converter/
Show diffs side-by-side
added
removed
1
#canvas {border: none;" width="400" height="400}
b'\\ No newline at end of file'