neon: fix merge error
authorDavid Schleef <ds@schleef.org>
Thu, 25 Jun 2009 01:18:39 +0000 (18:18 -0700)
committerDavid Schleef <ds@schleef.org>
Thu, 25 Jun 2009 01:18:39 +0000 (18:18 -0700)
commitd7a7bd4ee7fda6d813542d339322588ac2b19069
tree9f04e7e33668e8092ef24c11b0667868edaf27e8
parent0c854f9b7536bfe30919eafc0fed8c273366ff8d
neon: fix merge error
orc/orcprogram.h