Vladimír Čunát 52404a868d Merge recent master into staging ...

Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix

2014-11-05 15:00:44 +01:00

..

cinnamon

desktops/cinnamon/*.nix: mark as broken per https://github.com/NixOS/nixpkgs/issues/2384

2014-04-28 23:20:37 +02:00

e17

Merge branch 'staging' into modular-stdenv

2014-09-08 18:24:58 +02:00

e18

Merge recent master into x-updates

2014-08-02 05:08:07 +02:00

e19

Upgrade: Enlightenment E19: 0.19.0 -> 0.19.1

2014-10-19 14:58:04 +02:00

enlightenment

…

gnome-2

fix scrollkeeper build

2014-10-28 11:36:44 +01:00

gnome-3

Merge remote-tracking branch 'origin/master' into staging.

2014-10-31 11:14:24 +01:00

kde-4.14

kde-workspace: Use automatic version (close #4383)

2014-10-05 17:05:40 +02:00

pantheon/apps/pantheon-terminal

Added granite

2014-10-09 01:55:27 +02:00

xfce

ristretto: wrap icon theme

2014-11-03 20:02:41 +00:00