Michael Weiss 46bcc0d498 pythonPackages.pyqt5: Add optional qtwebsockets support ... This is e.g. required for gns3-gui 2.1.0. But it seems to break the build for Python 2.7.		2017-11-12 19:56:45 +01:00
..
applications	Merge pull request #31537 from orivej/lkl	2017-11-12 18:09:34 +00:00
build-support	Merge pull request #31356 from FRidh/fetchgitPrivate	2017-11-10 10:57:50 +01:00
common-updater
data	Merge branch 'staging'	2017-11-12 19:08:05 +01:00
desktops	vte-ng: 0.46.1.a -> 0.50.2.a	2017-11-09 09:41:16 +01:00
development	pythonPackages.pyqt5: Add optional qtwebsockets support	2017-11-12 19:56:45 +01:00
games	Merge pull request #16683 from rardiol/cataclysm-dda-git2	2017-11-12 18:56:26 +01:00
misc	Fix homepage links (see #30636)	2017-11-11 17:36:48 +01:00
os-specific	Merge branch 'staging'	2017-11-12 19:08:05 +01:00
servers	Merge pull request #31517 from ericsagnes/pkg-update/groonga	2017-11-11 16:35:17 +01:00
shells	nix-bash-completions: 0.1 -> 0.2	2017-11-11 17:06:08 +01:00
stdenv	bootstrap tools test: fixup after d71833ee36	2017-11-11 21:41:42 +01:00
test	treewide: Use *Platform.extensions	2017-09-13 11:16:10 -04:00
tools	Merge branch 'staging'	2017-11-12 19:08:05 +01:00
top-level	Merge pull request #16683 from rardiol/cataclysm-dda-git2	2017-11-12 18:56:26 +01:00