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)
Conflicts:
newlib/libc/sys/rtems/machine/_types.h
sim/rx/main.c
winsup/utils/cygcheck.cc


Trivial merge