Merge pull request #4 from kangax/master

sync to head
fabricjs · Jul 18, 2014 · cc83028 · cc83028
2 parents 69fdc22 + 17bf296
commit cc83028
Show file tree

Hide file tree

Showing 37 changed files with 729 additions and 545 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,6 @@
 language: node_js
 node_js:
-  - "0.8"
   - "0.10"
-  - "0.11"
 script: 'npm run-script build && npm test'
 before_install:
  - sudo apt-get update -qq

diff --git a/HEADER.js b/HEADER.js
@@ -44,3 +44,8 @@ fabric.SHARED_ATTRIBUTES = [
   "stroke-linejoin", "stroke-miterlimit",
   "stroke-opacity", "stroke-width"
 ];
+
+/**
+ * Pixel per Inch as a default value set to 96. Can be changed for more realistic conversion.
+ */
+fabric.DPI = 96;