aboutsummaryrefslogtreecommitdiffstats
path: root/COPYING.MIT
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-07-30 14:10:22 -0700
committerTom Rini <trini@ti.com>2012-07-30 14:10:22 -0700
commit8c37046a587e175931b291e272c93c6d33d548b8 (patch)
tree595c4b1733f38f8aac88d68e046621d3be756231 /COPYING.MIT
parent8a869e667867e8e7b1e82dcb53ee75dd58805e81 (diff)
parentd4f5768ba2b31e47973535b522cbc4e43f8170ce (diff)
downloadopenembedded-8c37046a587e175931b291e272c93c6d33d548b8.tar.gz
openembedded-8c37046a587e175931b291e272c93c6d33d548b8.tar.bz2
openembedded-8c37046a587e175931b291e272c93c6d33d548b8.zip
Merge branch '2011.03-maintenance' of git://arago-project.org/git/people/denix/openembedded into 2011.03-maintenance
Conflicts: recipes/opkg-utils/opkg-utils_git.bb I had taken a commit that updated opkg-utils slightly, but not enough. Denys' commit brings everything back into line. Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'COPYING.MIT')
0 files changed, 0 insertions, 0 deletions