git.sesse.net Git - mlt/commit

]> git.sesse.net Git - mlt/commit

projects / mlt / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bbe917b 2b33565)

author	Dan Dennedy <dan@dennedy.org>
	Tue, 30 Jun 2009 01:53:20 +0000 (18:53 -0700)
committer	Dan Dennedy <dan@dennedy.org>
	Tue, 30 Jun 2009 01:53:20 +0000 (18:53 -0700)
commit	9a244bf37831805cfa79aef7a2f27c32f3ab8cfc
tree	664ca252a53f866cc1d03ea6f18032f5a4b2ccfa	tree \| snapshot
parent	bbe917b54228488c6ba0cc7ecc9e53482500d5c1	commit \| diff
parent	2b33565ad9445409e41ec4a649c316f5640b863b	commit \| diff

Resolve merge conflict.

Signed-off-by: Dan Dennedy <dan@dennedy.org>

src/swig/configure

Unnamed repository; edit this file 'description' to name the repository.