Mercurial > hg > config
diff .fluxbox/init @ 61:01020f017806
merging something
| author | Jeff Hammel <jhammel@mozilla.com> | 
|---|---|
| date | Wed, 07 Apr 2010 07:15:28 -0700 | 
| parents | ecc21877c165 | 
| children | 8d25bb58a86d | 
| author | Jeff Hammel <jhammel@mozilla.com> | 
|---|---|
| date | Wed, 07 Apr 2010 07:15:28 -0700 | 
| parents | ecc21877c165 | 
| children | 8d25bb58a86d |