Permalink
Browse files

Merge branch 'release/1.3' into develop

  • Loading branch information...
Jake Archibald
Jake Archibald committed Jul 25, 2011
2 parents 6031827 + 9826279 commit 0d5970f40f2e1729cf043fab43f60feeb7135feb
View
@@ -12,6 +12,12 @@ Currently available online for you to use at http://spritecow.com
Changes
=======
v1.2 2011-07-25
---------------
* FIX: Bits of CSS & JS that stopped things working in Opera
* FIX: Bits of CSS & JS that stopped things working in IE10 (some remaining layout issues though)
v1.2 2011-07-20
---------------
View
@@ -1,4 +1,4 @@
#!/bin/bash
ver=3
ver=4
cat www/assets/$ver/script/{jquery-1.6.2,jquery.easing,jquery.transition,jquery.fileClickjack,intro,MicroEvent,Rect,ImgInput,SpriteCanvas,SpriteCanvasView,CssOutput,Toolbar,pageLayout,FeatureTest,featureTests,base}.js | bin/uglify/bin/uglifyjs --unsafe -o www/assets/$ver/script/mainmin.js
cat www/assets/$ver/style/base.css | java -jar bin/yuicompressor-2.4.5.jar --type css -o www/assets/$ver/style/mainmin.css

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Large diffs are not rendered by default.

Oops, something went wrong.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.

0 comments on commit 0d5970f

Please sign in to comment.