Merge branch 'master' into neon
authorDavid Schleef <ds@schleef.org>
Thu, 15 Apr 2010 20:07:20 +0000 (13:07 -0700)
committerDavid Schleef <ds@schleef.org>
Thu, 15 Apr 2010 20:07:20 +0000 (13:07 -0700)
commit8f9648731bc61f9bca46fcf01832745e7a5f3ac2
tree6debb152c6a118262438fe9c4a06e1228a417bc9
parent92105916b420d9b7eeefbeb02014c0119d3b97d6
parent327245966337a8bd984c5dc4e0993bdc2401d5d7
Merge branch 'master' into neon

Conflicts:
doc/table.xml
orc/orcprogram-sse.c
orc/orcprogram.h
testsuite/Makefile.am
testsuite/generate_xml_table.c
orc-float/orcfloat.c
orc-test/orctest.c
orc-test/orctest.h
orc/Makefile.am
orc/orc.c
orc/orcprogram.h
testsuite/Makefile.am
testsuite/generate_xml_table.c