diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-07-05 13:48:31 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-07-05 13:48:31 +0400 |
| commit | 5f2b123cc44605c18a4cbfb530fc89e0c3ef2325 (patch) | |
| tree | 9c1b7ab76c37aab3d47aef74291e7f24f46e7be4 /conf/licenses.conf | |
| parent | 84eb1db158bbcded971f35bfa89b72c13c797e6f (diff) | |
| parent | 2e23feebced982ef9a22d30ae2a4cfe453103c70 (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
Conflicts:
MAINTAINERS
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Diffstat (limited to 'conf/licenses.conf')
0 files changed, 0 insertions, 0 deletions