Merge branch 'master' of github.com:visionmedia/jade

pugjs · Apr 2, 2012 · 8a1b888 · 8a1b888
2 parents ed1a732 + 24c3dce
commit 8a1b888
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 8 deletions.
diff --git a/test/cases/aux/dialog.jade → test/cases/auxiliary/dialog.jade b/test/cases/aux/dialog.jade → test/cases/auxiliary/dialog.jade
diff --git a/test/cases/aux/escapes.html → test/cases/auxiliary/escapes.html b/test/cases/aux/escapes.html → test/cases/auxiliary/escapes.html
diff --git a/test/cases/aux/layout.jade → test/cases/auxiliary/layout.jade b/test/cases/aux/layout.jade → test/cases/auxiliary/layout.jade
diff --git a/test/cases/aux/mixins.jade → test/cases/auxiliary/mixins.jade b/test/cases/aux/mixins.jade → test/cases/auxiliary/mixins.jade
diff --git a/test/cases/aux/pet.jade → test/cases/auxiliary/pet.jade b/test/cases/aux/pet.jade → test/cases/auxiliary/pet.jade
diff --git a/test/cases/aux/smile.html → test/cases/auxiliary/smile.html b/test/cases/aux/smile.html → test/cases/auxiliary/smile.html
diff --git a/test/cases/aux/window.jade → test/cases/auxiliary/window.jade b/test/cases/aux/window.jade → test/cases/auxiliary/window.jade
diff --git a/test/cases/include.script.jade b/test/cases/include.script.jade
@@ -1,2 +1,2 @@
 script#pet-template(type='text/x-template')
-  include aux/pet
+  include auxiliary/pet
diff --git a/test/cases/includes.jade b/test/cases/includes.jade
@@ -1,8 +1,8 @@
 
-include aux/mixins
+include auxiliary/mixins
 
 mixin foo()
 
 body
-  include aux/smile.html
-  include aux/escapes.html
+  include auxiliary/smile.html
+  include auxiliary/escapes.html
diff --git a/test/cases/inheritance.alert-dialog.jade b/test/cases/inheritance.alert-dialog.jade
@@ -1,5 +1,5 @@
 
-extends aux/dialog
+extends auxiliary/dialog
 
 block content
   h1 Alert!

diff --git a/test/cases/inheritance.extend.jade b/test/cases/inheritance.extend.jade
@@ -1,5 +1,5 @@
 
-extend aux/layout
+extend auxiliary/layout
 
 block head
   script(src='jquery.js')

diff --git a/test/cases/inheritance.extend.whitespace.jade b/test/cases/inheritance.extend.whitespace.jade
@@ -1,5 +1,5 @@
 
-extend aux/layout
+extend auxiliary/layout
 
 block head
 

diff --git a/test/cases/inheritance.jade b/test/cases/inheritance.jade
@@ -1,5 +1,5 @@
 
-extends aux/layout
+extends auxiliary/layout
 
 block head
   script(src='jquery.js')