summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorStefan Müller-Klieser <s.mueller-klieser@phytec.de>2015-08-03 12:46:38 (GMT)
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2015-08-03 12:46:38 (GMT)
commit817b779e2d04c7a99b06fc7a1ecd8b2cfd1be948 (patch)
treedcf42def046d7c8da4195310242727cb6ce961e0 /.gitignore
parente2466c477660f8011f1d705744bb852a1cae0b06 (diff)
parentdf13048388ed2e1d420b47a702bb214071a66e98 (diff)
downloadmeta-phytec-817b779e2d04c7a99b06fc7a1ecd8b2cfd1be948.zip
meta-phytec-817b779e2d04c7a99b06fc7a1ecd8b2cfd1be948.tar.bz2
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--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 3343d28..e03547a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@ build*/
pyshtables.py
pstage/
sources/
-meta-*/
*.swp
*.orig
*.rej