Aristid Breitkreuz bf39c2e792 Merge pull request #4902 from mstarzyk/ocaml ... ocaml: 4.02.0 -> 4.02.1		2014-11-08 23:40:44 +01:00
..
applications	fix sha for a slim's theme	2014-11-08 22:40:36 +03:00
build-support	cabal: enable multi-threaded builds with GHC 7.8.x or later for executables	2014-11-07 23:22:27 +01:00
data	hasklig: new font	2014-11-07 01:14:48 +00:00
desktops	xfce4-volumed: add package (close #4628)	2014-11-08 21:48:51 +01:00
development	ocaml: 4.02.0 -> 4.02.1	2014-11-08 23:15:53 +01:00
games	crawl: more meta fixes; eval is fine now	2014-11-08 22:16:34 +01:00
misc	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
os-specific	Merge pull request #4780 from ambrop72/kernel-ppp-filter	2014-11-08 12:41:13 +01:00
servers	tomcat-connectors: 1.2.32 -> 1.2.40	2014-11-08 19:48:54 +01:00
shells	zsh: update from 5.0.6 to 5.0.7	2014-10-09 09:43:33 +02:00
stdenv	Allow marking licenses as unfree	2014-11-05 15:15:00 +01:00
test	s/dependancy/dependency/	2014-09-10 00:28:49 +01:00
tools	cjdns: service tweaks, new NixOS test	2014-11-08 23:39:02 +01:00
top-level	ocaml: 4.02.0 -> 4.02.1	2014-11-08 23:15:53 +01:00