diff options
author | Sergey Lapin <slapin@ossfans.org> | 2009-01-29 18:39:54 +0300 |
---|---|---|
committer | Sergey Lapin <slapin@ossfans.org> | 2009-01-29 18:39:54 +0300 |
commit | 7eee8a7d69244d34dfa8a7ba709a8e9faeb6c5b2 (patch) | |
tree | ecdf5a83482ba3f36524ca6c9f14c08589905b28 /packages/kexecboot/linux-kexecboot-2.6.21-hh20/htcbeetles/defconfig | |
parent | 54f043bf3da95b7016a7472a900a53973d391cb2 (diff) | |
parent | 9e63c8eb011504d7c9e75643d2ab9b17e679dcc9 (diff) | |
download | openembedded-7eee8a7d69244d34dfa8a7ba709a8e9faeb6c5b2.tar.gz |
Merge branch 'ieee80215' of git@git.openembedded.net:openembedded into ieee80215
Conflicts:
packages/net-snmp/net-snmp_svn.bb
packages/wireshark/tshark_0.99.4.bb
packages/wireshark/wireshark_0.99.4.bb
Diffstat (limited to 'packages/kexecboot/linux-kexecboot-2.6.21-hh20/htcbeetles/defconfig')
0 files changed, 0 insertions, 0 deletions