| commit | 5e9c594414677c5dcccac8ca8919033b75766e87 | |
| author | Scott Chacon <schacon@gmail.com> | |
| Fri, 28 May 2010 17:27:20 +0000 (28 10:27 -0700) | ||
| committer | Scott Chacon <schacon@gmail.com> | |
| Fri, 28 May 2010 17:27:20 +0000 (28 10:27 -0700) | ||
| tree | df24dd983c8be3cfb6fc942615fde7331d17aea6 | treesnapshot (tar.gz zip) |
| parent | 64ab270acf06fb65597c433e11c0eb38bcb82624 | commitdiff |
| parent | d247fa3532130a0bad2e65fddfb6f65b266635af | commitdiff |
Merge remote branch 'svenax/master'
Conflicts:
latex/config.yml
latex/makepdf
Conflicts:
latex/config.yml
latex/makepdf
| latex/config.yml | diff1 | diff2 | blobhistory |
| latex/makepdf | diff1 | diff2 | blobhistory |
| latex/template.tex | diff1 | diff2 | blobhistory |