Merge branch 'master' of github.com:/atgreen/libffi
authorAnthony Green <green@moxielogic.com>
Sat, 16 Nov 2013 11:57:54 +0000 (06:57 -0500)
committerAnthony Green <green@moxielogic.com>
Sat, 16 Nov 2013 11:57:54 +0000 (06:57 -0500)
commit34f878a5ef28663f6b1d7fd26fb099429ea1579e
treebaf169c6716f54e85557ef8937f8f25eae2a6070
parent83f65b63d9764a9cc7688fc5cda5ee2bd23faf54
parent1fd045784cac874b5d76b7fa931f67209a8280d3
Merge branch 'master' of github.com:/atgreen/libffi

Conflicts:
ChangeLog
src/powerpc/ffi.c