diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-10-26 16:31:59 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-10-26 16:31:59 (GMT) |
| commit | 5b5ba4d362e7ccc7e56355bb27b1fb06a2f5bd45 (patch) | |
| tree | b6484e3bcd31b5e236b33c86660c1792e2fd2b6e /abs/core/LinHES-system | |
| parent | e4840158643b9d3dd848fce7587d788870813438 (diff) | |
| parent | 179f31a64abadf4efffcaf927f991500bcf2d2a4 (diff) | |
| download | linhes_pkgbuild-5b5ba4d362e7ccc7e56355bb27b1fb06a2f5bd45.zip linhes_pkgbuild-5b5ba4d362e7ccc7e56355bb27b1fb06a2f5bd45.tar.gz linhes_pkgbuild-5b5ba4d362e7ccc7e56355bb27b1fb06a2f5bd45.tar.bz2 | |
Merge remote-tracking branch 'origin/testing' into testing
# By Britney Fransen
# Via Britney Fransen
* origin/testing:
LinHES-system: LinHES-session: fix unclutter config path
mythtv: bump to get latest fixes
iguanair: update to 1.0.3. refs #848
dvb-firmware: add dvb-fe-cx24116.fw. closes #852
Conflicts:
abs/core/LinHES-system/PKGBUILD
abs/core/iguanair/PKGBUILD
abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
Diffstat (limited to 'abs/core/LinHES-system')
| -rwxr-xr-x | abs/core/LinHES-system/LinHES-session | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session index d7c0151..0c61c6f 100755 --- a/abs/core/LinHES-system/LinHES-session +++ b/abs/core/LinHES-system/LinHES-session @@ -84,7 +84,7 @@ function msg(){ function unclutter(){ - if [ -e /etc/unclutter ] + if [ -e /etc/unclutter.cfg ] then . /etc/unclutter.cfg else |