diff options
author | Michael Stone <michael@laptop.org> | 2010-12-19 00:43:39 (GMT) |
---|---|---|
committer | Michael Stone <michael@laptop.org> | 2010-12-19 00:43:39 (GMT) |
commit | 759e670e304f829134168265898b6f290fc0246d (patch) | |
tree | 5cc980f7152e5d828ae944bcc488d864c33c16f7 | |
parent | 11afc83ff0d2558210065539ba7675f639b9fa04 (diff) | |
parent | 4f00873a4691e2d47cda3dd5634a4ea364b84853 (diff) | |
parent | f63a4641a7749fba48e44ec7cf1c347a889d372a (diff) | |
parent | 3ad943b66da16724aaf8023b5ebac966c205b409 (diff) | |
parent | ec4e61dfa8adc85ec7371b11ea582585c50a0d71 (diff) |
Merge branches 'ms/vnc', 'ms/slo2199', 'bp/build' and 'ss/orbit' into nextnext
* ms/vnc:
Start work on a port to VNC.
* ms/slo2199:
slo#2199: Pass rainbow-easy's parent's PATH through to its child.
Abstract out the procedure for reading parent environment variables.
* bp/build:
build: prettify make output
build: remove -W warning, is the same thing as -Wextra
* ss/orbit:
rainbow-sugarize: tweak permissions for Orbit unix socket (SL#2458)