diff options
author | Mason Larobina <mason.larobina@gmail.com> | 2009-12-20 23:18:24 +0800 |
---|---|---|
committer | Mason Larobina <mason.larobina@gmail.com> | 2009-12-20 23:18:24 +0800 |
commit | 370a07a913e71d149ffbd63013dcd38183bc2ed6 (patch) | |
tree | 4dd345f23550cab6f97f5e7c8d7374d7ae0f96a2 | |
parent | a2750abacb2cc9460aeb99cc9e960be0bd062b09 (diff) | |
parent | 17aeebf82b466f3190adf4fe07a82ea684b48b39 (diff) |
Merge branch 'master' of git://github.com/Dieterbe/uzbl
Conflicts:
sandbox/env.sh
-rw-r--r-- | examples/config/uzbl/config | 2 | ||||
-rwxr-xr-x | sandbox/env.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config index 34574cc..33e074f 100644 --- a/examples/config/uzbl/config +++ b/examples/config/uzbl/config @@ -327,4 +327,4 @@ set toggle_cmd_ins = @toggle_modes command insert # === Post-load misc commands =============================================== # Set the "home" page. -set uri = uzbl.org +set uri = uzbl.org/doesitwork/@COMMIT diff --git a/sandbox/env.sh b/sandbox/env.sh index 157ef36..0bf812a 100755 --- a/sandbox/env.sh +++ b/sandbox/env.sh @@ -8,5 +8,5 @@ export XDG_DATA_HOME=./sandbox/examples/data export XDG_CACHE_HOME=./sandbox/examples/cache export XDG_CONFIG_HOME=./sandbox/examples/config -export PATH=".sandbox/usr/local/share/uzbl/examples/data/uzbl/scripts/:$PATH" # needed when running uzbl-browser from here. not sure anymore why +#export PATH="./sandbox/usr/local/share/uzbl/examples/data/uzbl/scripts/:$PATH" # needed when running uzbl-browser from here? don't think so.. export PATH="./sandbox/usr/local/bin:$PATH" # needed to run uzbl-browser etc from here |