Permalink
Browse files

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

Conflicts:
	AUTHORS.txt
	CHANGES.rst
	mathics/builtin/strings.py
  • Loading branch information...
2 parents 5e797ce + 780e9bc commit 6f2b0a74090bd0313369a384848190de53d2d2f2 @poeschko poeschko committed Nov 11, 2012
Showing with 791 additions and 27 deletions.
  1. +1 −1 AUTHORS.txt
  2. +2 −0 CHANGES.rst
  3. +768 −8 mathics/builtin/datentime.py
  4. +17 −18 mathics/builtin/strings.py
  5. +3 −0 mathics/settings.py
View
@@ -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:
View
@@ -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
---
Oops, something went wrong.

0 comments on commit 6f2b0a7

Please sign in to comment.