| commit | 191a4c404ab57be4466e9b2d6ef25c6c77152602 | |
| author | Shea Levy <shea@shealevy.com> | |
| Wed, 31 Aug 2011 18:12:33 +0000 (31 18:12 +0000) | ||
| committer | Shea Levy <shea@shealevy.com> | |
| Wed, 31 Aug 2011 18:12:33 +0000 (31 18:12 +0000) | ||
| tree | 23000acd1260299138cdb9cf355ab0054ecfc783 | treesnapshot (tar.gz zip) |
| parent | f7f9b39450877382151dc0bdd10281404780f19f | commitdiff |
| parent | 04b1ac31da9885e3b1893a98e5280b8f9a039652 | commitdiff |
Merge from trunk
svn path=/nixpkgs/branches/darwin-updates/; revision=28944
svn path=/nixpkgs/branches/darwin-updates/; revision=28944