diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
commit | 293b05335ab540c4c8402e0a5caf2886b786a318 (patch) | |
tree | 11e5a7c2dce338058f150e08d1ff47c9d4d8eccd /recipes/images/shr-lite-image/etc/profile.d/elementary.sh | |
parent | 1ee2156592ba17f64f3c9b8970285a259730b871 (diff) | |
parent | e9aacc4ce4784c91cb4908145b8fb7b3ec8aa6e0 (diff) | |
download | openembedded-293b05335ab540c4c8402e0a5caf2886b786a318.tar.gz |
Merge remote branch 'origin/org.openembedded.dev' into shr/testing2010
Conflicts:
recipes/linux/linux-openmoko-devel_git.bb
recipes/openmoko-3rdparty/pisi_0.5.2.bb
recipes/openmoko-3rdparty/pisi_0.5.3.bb
recipes/openmoko-3rdparty/pisi_0.5.bb
recipes/uclibc/uclibc_nptl.bb
Diffstat (limited to 'recipes/images/shr-lite-image/etc/profile.d/elementary.sh')
-rwxr-xr-x | recipes/images/shr-lite-image/etc/profile.d/elementary.sh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/recipes/images/shr-lite-image/etc/profile.d/elementary.sh b/recipes/images/shr-lite-image/etc/profile.d/elementary.sh deleted file mode 100755 index da435964a7..0000000000 --- a/recipes/images/shr-lite-image/etc/profile.d/elementary.sh +++ /dev/null @@ -1,4 +0,0 @@ -export ELM_ENGINE=x11 -export ELM_THEME=default -export ELM_SCALE=2 -export ELM_FINGER_SIZE=70 |