Arseniy Seroka b81e25ef49 Merge pull request #10008 from rycee/fix/eclipse-plugin-scala ... eclipse-plugin-scala: 4.1.1 -> 4.1.1.20150911		2015-09-23 18:23:12 +03:00
..
applications	Merge pull request #10008 from rycee/fix/eclipse-plugin-scala	2015-09-23 18:23:12 +03:00
build-support	separateDebugInfo: one more comment	2015-09-23 10:35:40 +02:00
data	Merge: xlibs and x11 attribute cleanup	2015-09-23 10:42:34 +02:00
desktops	Merge: xlibs and x11 attribute cleanup	2015-09-23 10:42:34 +02:00
development	configuration-hackage2nix.yaml: fix evaluation errors on Darwin	2015-09-23 17:17:45 +02:00
games	Merge: xlibs and x11 attribute cleanup	2015-09-23 10:42:34 +02:00
misc	Merge: xlibs and x11 attribute cleanup	2015-09-23 10:42:34 +02:00
os-specific	Merge: xlibs and x11 attribute cleanup	2015-09-23 10:42:34 +02:00
servers	Merge: xlibs and x11 attribute cleanup	2015-09-23 10:42:34 +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	miniupnpc: further downgrade to 1.9.20150430	2015-09-23 12:06:46 +02:00
top-level	tweakAlias: simplify, thanks to @edolstra	2015-09-23 12:37:47 +02:00