Vladimír Čunát 86639d9bb9 Merge branch 'master' into x-updates ... Conflicts (taken master versions): pkgs/desktops/xfce-4.8/core/libxfcegui4.nix pkgs/desktops/xfce/applications/gigolo.nix pkgs/desktops/xfce/applications/mousepad.nix pkgs/desktops/xfce/applications/ristretto.nix pkgs/desktops/xfce/applications/terminal.nix pkgs/desktops/xfce/applications/xfce4-mixer.nix pkgs/desktops/xfce/applications/xfce4-notifyd.nix pkgs/desktops/xfce/applications/xfce4-taskmanager.nix pkgs/desktops/xfce/art/xfce4-icon-theme.nix pkgs/desktops/xfce/core/exo.nix pkgs/desktops/xfce/core/garcon.nix pkgs/desktops/xfce/core/gtk-xfce-engine.nix pkgs/desktops/xfce/core/libxfce4ui.nix pkgs/desktops/xfce/core/libxfce4util.nix pkgs/desktops/xfce/core/libxfcegui4.nix pkgs/desktops/xfce/core/thunar-volman.nix pkgs/desktops/xfce/core/thunar.nix pkgs/desktops/xfce/core/tumbler.nix pkgs/desktops/xfce/core/xfce4-appfinder.nix pkgs/desktops/xfce/core/xfce4-panel.nix pkgs/desktops/xfce/core/xfce4-power-manager.nix pkgs/desktops/xfce/core/xfce4-session.nix pkgs/desktops/xfce/core/xfce4-settings.nix pkgs/desktops/xfce/core/xfconf.nix pkgs/desktops/xfce/core/xfdesktop.nix pkgs/desktops/xfce/core/xfwm4.nix pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix pkgs/development/libraries/webkit/default.nix pkgs/top-level/all-packages.nix		2013-03-09 17:55:37 +01:00
..
analysis	valgrind: Support Glibc 2.17	2013-01-28 17:19:03 +01:00
boomerang
build-managers	gnumake381: fix the patching because of gnumake	2013-02-27 15:26:56 +01:00
casperjs	new package: casperjs	2012-12-13 17:51:03 +01:00
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-09 17:55:37 +01:00
neoload	neoload: upgrade to 4.1.1	2012-12-04 12:02:36 +01:00
ocaml	ocamlPackages.opam: Fix indentation	2013-03-08 17:12:56 -05:00
parsing	alex: disable 'doCheck' to avoid compilation errors	2013-02-25 00:32:42 +01:00
phantomjs	buildNativeInputs -> nativeBuildInputs	2013-01-13 11:33:45 +01:00
profiling	oprofile: fix via minor update	2013-02-23 23:49:48 +01:00
pydb	pydb: mirror://sourceforge.net/ is no longer valid	2013-02-05 20:35:39 +01:00
selenium	Add chromedriver: a server for running Selenium tests in Chrome	2013-02-26 00:41:10 +01:00