merged things from devel

This commit is contained in:
Araq 2014-09-12 01:37:48 +02:00
commit 9d9c3fe121
14 changed files with 110 additions and 48 deletions

View file

@ -514,7 +514,7 @@ elif defined(JS):
result.setFullYear(timeInfo.year)
result.setDate(timeInfo.monthday)
proc `$`(timeInfo: TimeInfo): string = return $(TimeInfoToTIme(timeInfo))
proc `$`(timeInfo: TimeInfo): string = return $(timeInfoToTime(timeInfo))
proc `$`(time: Time): string = return $time.toLocaleString()
proc `-` (a, b: Time): int64 =