Vladimír Čunát b1eeae8cac Merge branch 'master' into x-updates ... Conflicts (easy): pkgs/desktops/xfce/core/xfdesktop.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/pango/default.nix		2013-03-17 11:28:28 +01:00
..
analysis
boomerang
build-managers	cmake setup-hook: fixing cmakeFlagsArray	2013-03-12 11:31:58 +01:00
casperjs
cdecl
documentation	haddock: disable 'doCheck' to avoid compilation errors	2013-02-25 00:32:42 +01:00
guile
haskell	haskell-cabal2nix: update to version 1.47	2013-03-08 13:44:59 +01:00
java
literate-programming/noweb
misc	Merge branch 'master' into x-updates	2013-03-17 11:28:28 +01:00
neoload
ocaml	ocamlPackages.opam: Fix indentation	2013-03-08 17:12:56 -05:00
parsing	haskell-alex: update to version 3.0.5	2013-03-11 11:26:15 +01:00
phantomjs
profiling	oprofile: fix via minor update	2013-02-23 23:49:48 +01:00
pydb
selenium	Add chromedriver: a server for running Selenium tests in Chrome	2013-02-26 00:41:10 +01:00