OSDN Git Service

Merge commit '97841852f4cb6c2' into tmp
authormonaka@pizzafactory.jp <azureuser@monami-build-u1.monami-build-a1.h1.internal.cloudapp.net>
Sat, 26 Apr 2014 05:05:00 +0000 (05:05 +0000)
committermonaka@pizzafactory.jp <azureuser@monami-build-u1.monami-build-a1.h1.internal.cloudapp.net>
Sat, 26 Apr 2014 05:05:00 +0000 (05:05 +0000)
commitb110964dfb2d0779466e4e604983d3afa83993a4
treecc24c519c71d715d5f1fa55c3f951ea99fd96b35
parenta88abcbadcc76cd476e52d9095bf349d42c01014
parent97841852f4cb6c24e5831ff73cba2f95e866a66a
Merge commit '97841852f4cb6c2' into tmp

Conflicts:
newlib/libc/sys/rtems/machine/_types.h
sim/rx/main.c
winsup/utils/cygcheck.cc