Peter Simons 4cf52df32e Merge pull request #5663 from ryantrinkle/fix-cabal-js ... Use Cabal_1_22_0_0 instead of Cabal_HEAD in cabalJs		2015-01-09 15:33:03 +01:00
..
applications	Merge pull request #5639 from magnetophon/faust2jack	2015-01-08 23:29:57 +01:00
build-support	Merge pull request #5663 from ryantrinkle/fix-cabal-js	2015-01-09 15:33:03 +01:00
data
desktops	gnome-shell: add missing sqlite needed by libcamel	2015-01-08 12:34:12 +01:00
development	Merge pull request #5659 from mpickering/master	2015-01-09 14:16:41 +01:00
games	Merge pull request #5518 from tomberek/patch-1	2015-01-08 02:56:23 -06:00
misc	Merge pull request #5592 from AndersonTorres/fsuae	2015-01-06 09:59:56 +00:00
os-specific	Merge pull request #5603 from abbradar/iwlwifi	2015-01-08 01:53:21 +01:00
servers	elasticsearch: Update from 1.3.4 to 1.4.2	2015-01-09 00:04:59 +01:00
shells
stdenv	restore pkgs.gcc = stdenv.cc	2015-01-03 09:54:02 -05:00
test
tools	Merge pull request #5653 from nckx/mp3fs	2015-01-09 09:52:01 +01:00
top-level	Merge pull request #5662 from krisajenkins/case-fix	2015-01-09 14:17:20 +01:00