Jos van den Oever d8b93eb1cd Fix compilation of language-glsl. ... The issue / patch https://github.com/noteed/language-glsl/pull/10 fixes a compilation problem with language-glsl. The packages pretty and prettyclass conflicted when compiled with GHC 7.10.		2015-05-10 18:50:07 +02:00
..
applications	Merge pull request #7775 from k0ral/mpv	2015-05-09 19:15:18 +01:00
build-support	kernel: 4.0.1 -> 4.0.2	2015-05-07 20:32:24 -07:00
data	man-pages 3.83 -> 4.00	2015-05-09 17:38:35 +02:00
desktops	meta.description fixups	2015-04-30 18:17:42 +02:00
development	Fix compilation of language-glsl.	2015-05-10 18:50:07 +02:00
games	uqm: Bring back package and fix 3do extractor.	2015-05-07 08:03:06 +02:00
misc	slock: 1.1 -> 1.2	2015-05-09 11:02:19 +00:00
os-specific	phc-intel: don't try to build on _grsec kernels	2015-05-09 02:49:41 +02:00
servers	mariadb: 10.0.17 -> 10.0.18	2015-05-08 05:40:35 -07:00
shells	pythonPackages.ipython: 2.3.1 -> 3.1.0	2015-05-02 22:05:07 +02:00
stdenv	busybox: 1.22.1 -> 1.23.2	2015-05-06 00:15:16 -07:00
test	Merge recent master into staging	2014-09-13 21:48:29 +02:00
tools	Merge pull request #7774 from rushmorem/s3ql	2015-05-09 17:41:06 +03:00
top-level	Add cfr 0_100: another Java decompiler	2015-05-09 17:38:35 +02:00