Permalink
Browse files

Merge remote-tracking branch 'schanzer/master' into stable

Conflicts:
	js-runtime/lib/world/world.js
  • Loading branch information...
2 parents 59348d8 + d42619f commit f3898034ae86f64223f1e00c3db3633b8b4e8db6 @dyoo dyoo committed Apr 1, 2013
View
Oops, something went wrong.
View
Oops, something went wrong.
View
@@ -238,7 +238,7 @@
;; Helper function.
(define (bf name)
(make-binding:constant name module-path
- (if (member name '(video-url
+ (if (member name '(video/url
bitmap/url
image-url
open-image-url))
@@ -260,6 +260,7 @@
color-alpha
empty-scene
scene+line
+ put-image
place-image
place-image/align
put-pinhole
Oops, something went wrong.

0 comments on commit f389803

Please sign in to comment.