Peter Simons b33ad366a1 Merge branch 'master' into stdenv-updates.

2013-01-11 15:46:10 +01:00

..

applications

Merge branch 'master' into stdenv-updates.

2013-01-11 15:46:10 +01:00

build-support

Merge branch 'stdenv-updates' into pi-stdenv-updates

2012-12-29 14:18:43 +00:00

data

Merge branch 'master' into stdenv-updates.

2013-01-11 15:46:10 +01:00

desktops

Merge branch 'master' into stdenv-updates.

2013-01-11 15:46:10 +01:00

development

Merge branch 'master' into stdenv-updates.

2013-01-11 15:46:10 +01:00

games

Merge branch 'master' into stdenv-updates.

2013-01-11 15:46:10 +01:00

lib

Merge branch 'master' into stdenv-updates.

2013-01-11 15:46:10 +01:00

misc

Merge branch 'master' into stdenv-updates.

2013-01-11 15:46:10 +01:00

os-specific

Merge branch 'master' into stdenv-updates.

2013-01-11 15:46:10 +01:00

servers

Merge branch 'master' into stdenv-updates.

2013-01-11 15:46:10 +01:00

shells

Rename buildNativeInputs -> nativeBuildInputs

2012-12-28 19:20:09 +01:00

stdenv

Merge branch 'pi-stdenv-updates' into stdenv-updates

2012-12-31 16:03:16 +00:00

test

…

tools

Merge branch 'master' into stdenv-updates.

2013-01-11 15:46:10 +01:00

top-level

Merge branch 'master' into stdenv-updates.

2013-01-11 15:46:10 +01:00