Andreas Rumpf 61d9292095 fixes merge conflict

2018-06-11 01:25:48 +02:00

..

alloc.nim

…

ansi_c.nim

…

arithm.nim

…

assign.nim

warn about inconsistent spacing around binary operators; fixes #7582

2018-05-05 14:58:33 +02:00

atomics.nim

Minor fixes to enable tcc

2018-05-14 11:40:59 +02:00

avltree.nim

…

cellsets.nim

…

cgprocs.nim

…

channels.nim

fixes seq copying in channels for --gc:regions

2018-06-07 21:35:41 +02:00

chcks.nim

…

debugger.nim

…

deepcopy.nim

warn about inconsistent spacing around binary operators; fixes #7582

2018-05-05 14:58:33 +02:00

dyncalls.nim

…

embedded.nim

Yield in try

2018-05-09 22:25:28 +03:00

endb.nim

…

excpt.nim

Yield in try

2018-05-09 22:25:28 +03:00

gc2.nim

…

gc_common.nim

Expose GC_setStackBottom (#7885)

2018-06-04 11:12:18 +02:00

gc_ms.nim

…

gc_regions.nim

Expose GC_setStackBottom (#7885)

2018-06-04 11:12:18 +02:00

gc.nim

warn about inconsistent spacing around binary operators; fixes #7582

2018-05-05 14:58:33 +02:00

hti.nim

…

inclrtl.nim

…

jssys.nim

JS hotfix for the Internet Explorer up to version 11

2018-05-25 23:19:54 +02:00

memtracker.nim

…

mmdisp.nim

Expose GC_setStackBottom (#7885)

2018-06-04 11:12:18 +02:00

nimscript.nim

…

osalloc.nim

Native access to Genode environment

2018-06-07 07:21:20 +02:00

platforms.nim

rename 'nimrodVM' to 'nimVM'

2018-05-28 18:01:56 +02:00

profiler.nim

…

repr.nim

…

reprjs.nim

…

sets.nim

…

sysio.nim

…

syslocks.nim

…

sysspawn.nim

…

sysstr.nim

Use new binarySearch everywhere (#7876)

2018-05-25 00:04:30 +03:00

threads.nim

Native access to Genode environment

2018-06-07 07:21:20 +02:00

timers.nim

…

widestrs.nim

…