OSDN Git Service

Merge branch 'origin'
authorEric Anholt <eric@anholt.net>
Tue, 14 Nov 2006 22:37:46 +0000 (14:37 -0800)
committerEric Anholt <eric@anholt.net>
Tue, 14 Nov 2006 22:37:46 +0000 (14:37 -0800)
commite29843d3b0ff5d32d8ab4bc84c58300782d189d3
treee399e43b87dda567d9932dab1774c109c431356c
parent07b09d930ed2b7eae299ae036ec30099374b95aa
parentd05da6520a273ee4c2f0e11b5a9bac65b51835fe
Merge branch 'origin'

Conflicts:

src/Makefile.am
configure.ac
src/Makefile.am