Merge branch 'time' of https://github.com/sn6uv/Mathics into sn6uv-time

Conflicts: AUTHORS.txt CHANGES.rst mathics/builtin/strings.py
mathics · Nov 11, 2012 · 6f2b0a7 · 6f2b0a7
2 parents 5e797ce + 780e9bc
commit 6f2b0a7
Show file tree

Hide file tree

Showing 5 changed files with 791 additions and 27 deletions.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -4,7 +4,7 @@ Mathics was created and is mainly maintained by:
 
 Additional contributions were made by:
 
-- Angus Griffith (github: sn6uv): adaptive sampling for Plot, 3D graphics, Prime, ElementData, DSolve, RSolve
+- Angus Griffith (github: sn6uv): adaptive sampling for Plot, 3D graphics, date functions, Prime, ElementData, DSolve, RSolve
 - Chong Jiang (github: cjiang): Log2, Log10
 
 Thanks to the authors of all projects that are used in Mathics:

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -7,6 +7,8 @@ CHANGES
 - ElementData using data from Wikipedia
 - added Switch
 - added DSolve and RSolve
+- More Timing functions AbsoluteTiming, TimeUsed, SessionTime, Pause
+- Date functions DateList, DateString, DateDifference, etc
 
 0.5
 ---