diff options
| author | Stefan Müller-Klieser <s.mueller-klieser@phytec.de> | 2015-08-03 14:46:38 +0200 |
|---|---|---|
| committer | Stefan Müller-Klieser <s.mueller-klieser@phytec.de> | 2015-08-03 14:46:38 +0200 |
| commit | 817b779e2d04c7a99b06fc7a1ecd8b2cfd1be948 (patch) | |
| tree | dcf42def046d7c8da4195310242727cb6ce961e0 /.gitignore | |
| parent | e2466c477660f8011f1d705744bb852a1cae0b06 (diff) | |
| parent | df13048388ed2e1d420b47a702bb214071a66e98 (diff) | |
| download | meta-phytec-817b779e2d04c7a99b06fc7a1ecd8b2cfd1be948.tar.bz2 meta-phytec-817b779e2d04c7a99b06fc7a1ecd8b2cfd1be948.zip | |
layer merge: meta-phyimx6
Merge remote-tracking branch 'phyimx6/dizzy-next' into fido-next
Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
Conflicts:
.gitignore
README
conf/bblayers.conf.sample
conf/layer.conf
scripts/init
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -5,7 +5,6 @@ build*/ pyshtables.py pstage/ sources/ -meta-*/ *.swp *.orig *.rej |