Bryan Gardiner 4eb5068a13 claws-mail: fix conflict with shared_mime_info link ... Fixes #10156. Close #10157.		2015-09-30 19:43:29 +02:00
..
applications	claws-mail: fix conflict with shared_mime_info link	2015-09-30 19:43:29 +02:00
build-support	Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream	2015-09-23 14:35:36 -07:00
data	geolite-legacy: update 2015-09-22 -> 2015-09-29	2015-09-29 13:48:31 +02:00
desktops	plasma54: don't override mkDerivation	2015-09-29 16:58:59 -05:00
development	pythonPackages: bump pyramid, webob and btrees	2015-09-30 18:15:21 +02:00
games	Merge pull request #10081 from fazo96/openmw	2015-09-28 00:27:53 +03:00
misc	kde414: build with kdelibs-4.14.12	2015-09-27 15:08:12 -05:00
os-specific	kernel: Remove uneeded patch for 4.2	2015-09-29 17:47:18 -07:00
servers	neard: add sample applications	2015-09-30 16:10:16 +02:00
shells	Merge commit 'a6f6c0e' into master.upstream	2015-09-15 12:16:49 -07:00
stdenv	separateDebugInfo: Assert Linux	2015-09-22 20:21:10 +02:00
test
tools	Remove nixops unstable expression, until we reintroduce it again. Currently it is not referenced, as nixopsUnstable = nixops.	2015-09-30 12:49:11 +00:00
top-level	pythonPackages: bump pyramid, webob and btrees	2015-09-30 18:15:21 +02:00