merged revisions -c17864,17866

svn: r17870
deeglaze · Jan 28, 2010 · 54ba58f · 54ba58f
1 parent 6026393
commit 54ba58f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/collects/scribblings/reference/sandbox.scrbl b/collects/scribblings/reference/sandbox.scrbl
@@ -811,7 +811,7 @@ in a way that depends on the setting of @scheme[(sandbox-output)] or
 
 Retrieves uncovered expression from an evaluator, as longs as the
 @scheme[sandbox-coverage-enabled] parameter had a true value when the
-evaluator was created. Otherwise, and exception is raised to indicate
+evaluator was created. Otherwise, an exception is raised to indicate
 that no coverage information is available.
 
 The @scheme[prog?] argument specifies whether to obtain expressions that

diff --git a/doc/release-notes/teachpack/HISTORY.txt b/doc/release-notes/teachpack/HISTORY.txt
@@ -1,3 +1,13 @@
+------------------------------------------------------------------------
+Version 4.2.4				  [Thu Jan 28 12:02:01 EST 2010]
+
+* separated 2htdp/universe from htdp/image
+* 2htdp/universe contains some stupid hacks to improve performance 
+  -- to be changed with Matthew's advice  
+* error modified 
+* added a bunch of primitives for JPR 
+* fixed some other bugs 
+
 ------------------------------------------------------------------------
 Version 4.2.3				  [Sun Nov 22 19:25:01 EST 2009]