William A. Kennington III 333f145d76 Merge branch 'master.upstream' into staging.upstream

2015-07-13 15:11:31 -07:00

..

applications

Merge branch 'master.upstream' into staging.upstream

2015-07-13 15:11:31 -07:00

build-support

Set ‘allowSubstitutes = false’ on various derivations

2015-07-09 15:10:37 +02:00

data

Merge branch 'master.upstream' into staging.upstream

2015-07-13 15:11:31 -07:00

desktops

gnome3.gnome-user-share: fix build (ZHF)

2015-07-11 10:28:00 +02:00

development

Merge branch 'master.upstream' into staging.upstream

2015-07-13 15:11:31 -07:00

games

Merge branch 'master.upstream' into staging.upstream

2015-07-13 15:11:31 -07:00

misc

vimPlugins: add changeColorScheme-vim

2015-07-09 14:28:11 +12:00

os-specific

Merge branch 'master.upstream' into staging.upstream

2015-07-13 15:11:31 -07:00

servers

Merge branch 'master.upstream' into staging.upstream

2015-07-13 15:11:31 -07:00

shells

Merge branch 'master.upstream' into staging.upstream

2015-07-13 15:11:31 -07:00

stdenv

make bootstrap files buildable in sandbox

2015-07-10 14:00:47 -07:00

test

…

tools

Merge branch 'master.upstream' into staging.upstream

2015-07-13 15:11:31 -07:00

top-level

Merge branch 'master.upstream' into staging.upstream

2015-07-13 15:11:31 -07:00