diff options
| author | Jesse Gilles <jgilles@multitech.com> | 2014-01-17 13:45:19 -0600 |
|---|---|---|
| committer | Jesse Gilles <jgilles@multitech.com> | 2014-01-17 13:45:19 -0600 |
| commit | 382a32756eaace2dd933426f5411cff4e111b70a (patch) | |
| tree | 5b3da2b007e814c89a33bdeed0ce30cf5956cfa9 /meta-java | |
| parent | 1e2d685cc07a2c3c8165662e7c0ebeb19cb1c16d (diff) | |
| parent | f88e1a39ae0758897f6c9680d27920d915c36952 (diff) | |
Merge branch 'mtocgd' into mtocgd-2.3.2
Conflicts:
multitech/recipes/images/corecdp-tftpboot.inc
multitech/recipes/linux/linux_2.6.39-at91.bb
Diffstat (limited to 'meta-java')
0 files changed, 0 insertions, 0 deletions