| commit | 45102c5ca937da98ee78513b0f3cb65848fabe5a | |
| author | iamcalvo <aoeu@aoeu.aoeu> | |
| Fri, 8 Jun 2007 00:38:04 +0000 (8 02:38 +0200) | ||
| committer | iamcalvo <aoeu@aoeu.aoeu> | |
| Fri, 8 Jun 2007 00:38:04 +0000 (8 02:38 +0200) | ||
| tree | 50441f27711ad5e3d695638f97af0a3064dea14e | treesnapshot (tar.gz zip) |
| parent | aa69d020ef37bbd0e0c74c6f16b4012c0704520d | commitdiff |
| parent | fe62ae70fcc771b26019370808df048a2c202984 | commitdiff |
Merge branch 'master' of /home/manom/cousas/informatica/codigo/scm/foo/
Conflicts:
readme
Conflicts:
readme
| readme | diff1 | diff2 | blobhistory |