Mercurial > hg > config
diff .fluxbox/startup @ 109:e83b7dd50461
merge commit
| author | Jeff Hammel <jhammel@mozilla.com> | 
|---|---|
| date | Mon, 29 Nov 2010 08:34:29 -0800 | 
| parents | f3ab51c79813 | 
| children | 5e69f8c64b6e | 
| author | Jeff Hammel <jhammel@mozilla.com> | 
|---|---|
| date | Mon, 29 Nov 2010 08:34:29 -0800 | 
| parents | f3ab51c79813 | 
| children | 5e69f8c64b6e |