diff options
| author |   Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 15:13:54 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 15:13:54 +0100 |
| commit | 74981bb0217ef397f510277351c369bf443cc591 (patch) | |
| tree | 4c04233d8447432172b45ce2c91bb563b40fd741 /.gitignore | |
| parent | f45580a1527dccdda100eee7f25f9f2c41af4db8 (diff) | |
| parent | b7e9814253f4b8f61e68d9aa7f518c1404cf417f (diff) | |
| download | openembedded-74981bb0217ef397f510277351c369bf443cc591.tar.gz | |
Merge commit 'origin/shr/merge' into shr/testing2009
Conflicts:
conf/distro/include/sane-srcrevs.inc
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions