From: Aaron Schaefer <aaron@elasticdog.com>
Date: Mon, 8 Sep 2008 06:20:42 +0000 (-0400)
Subject: Merge git://projects.elasticdog.com/git/factor into public
X-Git-Tag: 0.94~2439^2~83^2~1
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=fe24f3e82a93b7eadfc5cfe51cbe20b75e4d9409

Merge git://projects.elasticdog.com/git/factor into public

* git://projects.elasticdog.com/git/factor:
  Add standard deviation to output of ave-time benchmarking word
  Minor updates to standardize new Project Euler solutions
  Alternative solution to Project Euler problem 1

Conflicts:
	extra/project-euler/ave-time/ave-time.factor
---

fe24f3e82a93b7eadfc5cfe51cbe20b75e4d9409
diff --cc extra/project-euler/ave-time/ave-time.factor
index 56f7185095,ecf308ec11..be39b26a97
--- a/extra/project-euler/ave-time/ave-time.factor
+++ b/extra/project-euler/ave-time/ave-time.factor
@@@ -1,7 -1,7 +1,7 @@@
- ! Copyright (c) 2007 Aaron Schaefer
+ ! Copyright (c) 2007 Aaron Schaefer.
  ! See http://factorcode.org/license.txt for BSD license.
- USING: arrays combinators io kernel math math.functions math.parser
-     math.statistics namespaces sequences tools.time continuations ;
 -USING: combinators io kernel math math.functions math.parser math.statistics
++USING: continuations io kernel math math.functions math.parser math.statistics
+     namespaces tools.time ;
  IN: project-euler.ave-time
  
  : collect-benchmarks ( quot n -- seq )