Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
paulbellamy committed Jun 25, 2011
2 parents 19a51be + 9983ca2 commit 08beb4dbb86884dc171346d79e5d35dd98e7d3b7
Showing with 688 additions and 4 deletions.
  1. +1 −0 Makefile
  2. +1 −1 jsonp_test.go
  3. +1 −1 mango.go
  4. +614 −0 mime.go
  5. +62 −0 mime_test.go
  6. +2 −1 static.go
  7. +7 −1 static_test.go
View
@@ -11,6 +11,7 @@ GOFILES=\
routing.go\
static.go\
jsonp.go\
+ mime.go\
include $(GOROOT)/src/Make.pkg
View
@@ -173,7 +173,7 @@ func BenchmarkNonJSONP(b *testing.B) {
b.StartTimer()
for i := 0; i < b.N; i++ {
- nonJsonpApp(Env{"mango.request": &Request{request}})
+ nonJsonpApp(Env{"mango.request": &Request{request}})
}
b.StopTimer()
}
View
@@ -101,7 +101,7 @@ type Stack struct {
}
func Version() []int {
- return []int{0, 3, 4}
+ return []int{0, 3, 5}
}
func VersionString() string {
Oops, something went wrong.

0 comments on commit 08beb4d

Please sign in to comment.