diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-16 09:31:26 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-16 09:31:26 +0100 |
| commit | 74c7d672949580abed60647d9abbe70c39c516e1 (patch) | |
| tree | f270d1fd8bc0ca750547061a5502a5025bc3afa4 /.gitignore | |
| parent | 2598548bd9e250da9c2eb1c1b83f8bd97a937151 (diff) | |
| parent | fd265c020e524366c8db69fbedd2cf0bad471324 (diff) | |
| download | openembedded-74c7d672949580abed60647d9abbe70c39c516e1.tar.gz | |
Merge commit 'origin/martin_jansa/xorg-7.5' into shr/merge
Conflicts:
conf/distro/include/angstrom-2008-preferred-versions.inc
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions