nixpkgs

Author	SHA1	Message	Date
Peter Simons	1c0d15b90e	Merge branch 'origin/master' into staging. Conflicts: pkgs/development/libraries/ffmpeg/2.x.nix pkgs/development/libraries/serf/default.nix	2014-09-02 12:31:03 +02:00
Luca Bruno	463585a5ec	gnome-tweak-tool: update 3.10.1 -> 3.12.0	2014-09-02 11:24:49 +02:00
Luca Bruno	36bef2b267	gobject-introspection: refer to shlibs with absolute paths in typelibs After this, LD_LIBRARY_PATH should not be required anymore. The patch has been applied only for .la files, so there may be some other cases missing.	2014-08-14 23:16:51 +02:00
Luca Bruno	d05fa3ccfe	Branch gnome 3.12	2014-05-20 13:41:33 +02:00