Merge remote-tracking branch 'upstream/master'

Conflicts resolved: build/build.xml index.html
SlexAxton · Aug 5, 2011 · 0d4f6b5 · 0d4f6b5
2 parents a556e26 + cde1dc4
commit 0d4f6b5
Show file tree

Hide file tree

Showing 27 changed files with 27,098 additions and 2,530 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,9 @@
+* eol=lf
+*.png binary
+*.jpg binary
+*.gif binary
+*.jar binary
+*.exe binary
+*.eot binary
+*.ttf binary
+*.pdf binary
diff --git a/.gitignore b/.gitignore
@@ -8,14 +8,16 @@
 *.swp
 *.vi
 *~
+*.sass-cache
 
 # OS or Editor folders
 .DS_Store
 .cache
 .project
 .settings
+.tmproj
 nbproject
-thumbs.db
+Thumbs.db
 
 # Dreamweaver added files
 _notes
@@ -28,6 +30,8 @@ dwsync.xml
 # Folders to ignore
 .hg
 .svn
+.CVS
+intermediate
 publish
 .idea