diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-15 14:46:11 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-15 14:46:11 +0100 |
commit | 58884fc059504abafc9126613a7049464ba701e7 (patch) | |
tree | 61030608675a792923aff657516c48a6a2048693 /recipes/sphinx-speech | |
parent | 75820363234db9d6335997658c6f606654d1588c (diff) | |
parent | 47d6cb217ff161738488f4f82af9dd8f8c616ce0 (diff) | |
download | openembedded-58884fc059504abafc9126613a7049464ba701e7.tar.gz |
Merge commit 'origin/org.openembedded.dev' into martin_jansa/xorg-7.5
Conflicts:
conf/distro/include/angstrom-2008-preferred-versions.inc
Diffstat (limited to 'recipes/sphinx-speech')
0 files changed, 0 insertions, 0 deletions