Renaud d88d0127f7 Merge pull request #48148 from peterhoeg/p/scummvm_games ... scummvm: add several ScummVM supported games		2018-10-21 09:50:13 +02:00
..
applications	Merge staging-next into master	2018-10-21 08:37:30 +02:00
build-support	Merge pull request #48306 from NixOS/staging-next	2018-10-18 11:23:04 +02:00
common-updater
data	Merge staging-next into master	2018-10-21 08:37:30 +02:00
desktops	Merge master into staging-next	2018-10-20 09:40:09 +02:00
development	Merge pull request #48763 from tohl/master	2018-10-21 07:29:09 +00:00
games	Merge pull request #48148 from peterhoeg/p/scummvm_games	2018-10-21 09:50:13 +02:00
misc	Merge pull request #48750 from Ma27/fix-vim-clang-completion	2018-10-20 23:45:19 +01:00
os-specific	nfs-utils: add python3 to buildInputs	2018-10-21 08:42:43 +02:00
servers	plex: include Plex Commercial Skipper binary	2018-10-21 08:54:04 +02:00
shells	Merge pull request #46152 from Ma27/fix-setxkbmap-completion	2018-10-19 14:33:04 +02:00
stdenv	make-derivation: set CMAKE_SYSTEM_* when cross compiling	2018-10-16 21:50:37 -05:00
test	Merge branch 'master' into staging	2018-09-24 21:18:23 +02:00
tools	Merge staging-next into master	2018-10-21 08:37:30 +02:00
top-level	Merge pull request #48148 from peterhoeg/p/scummvm_games	2018-10-21 09:50:13 +02:00