| commit | 690ed664c6194bb131ad756ee59012b2294ba56d | |
| author | Dan Davison <davison@stats.ox.ac.uk> | |
| Thu, 16 Jul 2009 05:28:15 +0000 (16 01:28 -0400) | ||
| committer | Dan Davison <davison@stats.ox.ac.uk> | |
| Thu, 16 Jul 2009 05:28:15 +0000 (16 01:28 -0400) | ||
| tree | edfae08bc201c29bfae88008de29f7c05b8dfdc3 | treesnapshot (tar.gz zip) |
| parent | 2b273bce7df70383118ed83d606c2350e3b3f5c1 | commitdiff |
| parent | ad57e15afe3bb448d396a94b7f44f42b6efbee31 | commitdiff |
Merging master into results.
In order to get new tangle load-file function. Had to resolve org-babel.org conflict manually and didn't know the 'proper' way to do so, so there may be weirdness in that file.
In order to get new tangle load-file function. Had to resolve org-babel.org conflict manually and didn't know the 'proper' way to do so, so there may be weirdness in that file.
| org-babel.org | diff1 | diff2 | blobhistory |