| commit | 4a87eabf73ce9b1f09cb7fb408e1fe785f1ebe20 | |
| author | Scott Chacon <schacon@gmail.com> | |
| Fri, 28 May 2010 17:38:54 +0000 (28 10:38 -0700) | ||
| committer | Scott Chacon <schacon@gmail.com> | |
| Fri, 28 May 2010 17:38:54 +0000 (28 10:38 -0700) | ||
| tree | 5f35bd9001e114da6bea8077fa757a89ebeb28c9 | treesnapshot (tar.gz zip) |
| parent | 3721768aa54411c51d9b233c16d91389a0e2e5e2 | commitdiff |
| parent | 8956a0579ee73b89398b41c90e7347252a2ca3c7 | commitdiff |
Merge remote branch 'jang574/master'
Conflicts:
latex/config.yml
Conflicts:
latex/config.yml
| latex/config.yml | diff1 | diff2 | blobhistory |