Vladimír Čunát f7a4f146c9 Merge branch 'master' into staging ...

This includes a fix for a bad merge.

2017-04-14 19:22:02 +02:00

..

applications

Merge branch 'master' into staging

2017-04-14 19:22:02 +02:00

build-support

Merge branch 'master' into staging

2017-04-14 19:22:02 +02:00

common-updater

…

data

envypn-font: init at 1.7.1

2017-04-12 17:14:26 -05:00

desktops

Merge: fixup a bad merge

2017-04-14 19:11:17 +02:00

development

Merge branch 'master' into staging

2017-04-14 19:22:02 +02:00

games

steam: move libpciaccess as non-runtime dependencies

2017-04-11 01:51:46 +03:00

misc

vim-elixir: 2017-03-29 -> 2017-04-13

2017-04-13 18:46:37 +02:00

os-specific

Merge: fixup a bad merge

2017-04-14 19:11:17 +02:00

servers

Merge: fixup a bad merge

2017-04-14 19:11:17 +02:00

shells

Merge pull request #24760 from matthewbauer/linux-only-pkgs

2017-04-09 14:18:10 +02:00

stdenv

Merge branch 'master' into staging

2017-04-14 19:22:02 +02:00

test

…

tools

Merge branch 'master' into staging

2017-04-14 19:22:02 +02:00

top-level

Merge: fixup a bad merge

2017-04-14 19:11:17 +02:00