Merge branch 'z13' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 9 Jan 2017 10:52:42 +0000 (05:52 -0500)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 9 Jan 2017 10:52:42 +0000 (05:52 -0500)
commitb678471d6566ee20732b89a0de9940d454682247
tree6bf11f13342819ca7f436f31809a8250fc574cfd
parentb9bb0092368a0298f279977a45275bc997c7b84c
parent864e202afdc9761637b442f084f0f26039256fa4
Merge branch 'z13' into develop

Conflicts:
CONTRIBUTORS.md
CONTRIBUTORS.md
README.md
c_check
common.h
ctest.c
getarch.c
kernel/Makefile.L3
param.h