2014-10-05 17:20 UTC+0200 Viktor Szakats (vszakats users.noreply.github.com)
  * contrib/gtwvw/wvwdraw.c
    ! typo

  * src/macro/macro.y
    ? no idea why didn't go with the merge
Merge branch 'master' of https://github.com/vszakats/harbour-core

Conflicts [RESOLVED]:
	ChangeLog.txt