Merge with 6721482eaf8e8d35b1cd46f0a21285bfaa520d5a

made the code work with g++ without errors (but warnings)

fixed memory leak in ucx_map_rehash

made the code work with VC++ compiler (use make CONF=windows)

removed const from string.*

added some qualifiers + removed pointer alias in mergesort

added separated debug makefiles and some optimization options

(0) -30 -10 -7 +7 +10 +30 +100 +300 tip

mercurial