Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/libav/default.nix pkgs/shells/bash/bash-4.2-patches.nix pkgs/stdenv/generic/default.nix		2014-10-07 00:09:37 +02:00
..
apps	gobject-introspection: refer to shlibs with absolute paths in typelibs	2014-08-14 23:16:51 +02:00
core	yelp: Fix description	2014-08-24 15:25:27 +02:00
desktop/rarian
misc	gnome3.gitg: fix build by updating it to unstable	2014-08-28 20:53:01 +02:00
default.nix	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00