Peter Simons
0823aea0a6
Merge branch 'master' into stdenv-updates.
...
Conflicts:
pkgs/development/libraries/libxslt/default.nix
Commit 1764ea2b0a635587746d382db1b6cd832483a362 introduced changes to libxslt
in an awkward way to avoid re-builds on Linux. This patch has been simplified
during this merge.
2013-03-25 13:43:45 +01:00
..
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2012-04-23 15:47:31 +00:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2012-04-23 15:47:31 +00:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-23 15:58:14 +01:00
2013-03-15 20:38:15 +01:00
2013-03-23 15:58:14 +01:00
2013-03-21 16:26:18 +01:00
2012-09-13 15:13:00 +02:00