fixed missed conflict
2013-10-09 21:59 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
  * config/globsh.mk
    * use $(CP) as workaround for missing soft links in NT shell.
      I know about mklink but it needs quite new Windows version
      and soft links need special privileges. Anyhow better solution
      is highly welcome.

  * config/postinst.hb
    * use hardlinks or copy files if symlinks do not work

  * config/linux/gcc.mk
    * added support for non SH shells - it allows to create Android
      builds in MS-Windows using Android NDK from Google.
Merge https://github.com/harbour/core