summary refs log tree commit diff stats
path: root/tests
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2014-11-03 11:42:36 +0100
committerAraq <rumpf_a@web.de>2014-11-03 11:42:36 +0100
commitadad2d5f4aa9940278e4baab25d757246c74d4a2 (patch)
tree5f677641dafd9d79daff3bd9d2ac3b63de5fa7bf /tests
parent59c0a2db8427852d919f8a65cd0158d52ade2ab7 (diff)
parent6935171b85a1b08b1cdfba2a56d5291219d89b5f (diff)
downloadNim-adad2d5f4aa9940278e4baab25d757246c74d4a2.tar.gz
Merge branch 'devel' into bigbreak
Conflicts:
	lib/impure/db_postgres.nim
	lib/pure/json.nim
	lib/pure/math.nim
	lib/system/atomics.nim
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions