review.tizen.org Git - platform/upstream/orc.git/commit

projects / platform / upstream / orc.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1c3939d 4921211)

author	David Schleef <ds@schleef.org>
	Sun, 20 Sep 2009 03:29:04 +0000 (20:29 -0700)
committer	David Schleef <ds@schleef.org>
	Sun, 20 Sep 2009 03:29:04 +0000 (20:29 -0700)
commit	fdfa8d2255ae0d4b249c20cb71218a83eaab513e
tree	851e72203bbe9e7db943424b791c74d8d2bdf0ca	tree \| snapshot
parent	1c3939dc77f2cf41876e323233279b841d31eda8	commit \| diff
parent	4921211dbe91ba28a2a540c960a71bf2d135d14a	commit \| diff

Merge commit 'origin/master' into neon

Conflicts:
orc-test/orctest.c
testsuite/orcc/Makefile.am
tools/orcc.c

orc-test/orctest.c	diff1 \|	diff2 \|	blob \| history
orc/Makefile.am	diff1 \|	diff2 \|	blob \| history
orc/orc.c	diff1 \|	diff2 \|	blob \| history
orc/orcprogram.c	diff1 \|	diff2 \|	blob \| history
orc/orcprogram.h	diff1 \|	diff2 \|	blob \| history
testsuite/Makefile.am	diff1 \|	diff2 \|	blob \| history
testsuite/orcc/Makefile.am	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Media Common;