Vladimír Čunát 96cec2a7bd Merge 'staging' into multiple-outputs ... Conflicts: pkgs/applications/audio/flac/default.nix pkgs/build-support/gcc-wrapper/builder.sh pkgs/development/libraries/apr-util/default.nix pkgs/development/libraries/apr/default.nix pkgs/development/libraries/atk/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/glibc/2.17/builder.sh pkgs/development/libraries/glibc/2.17/locales.nix pkgs/development/libraries/libjpeg/default.nix pkgs/development/libraries/libogg/default.nix pkgs/development/libraries/libsamplerate/default.nix pkgs/development/libraries/libtiff/default.nix pkgs/development/libraries/libvorbis/default.nix pkgs/development/libraries/mesa/default.nix pkgs/development/libraries/pango/default.nix pkgs/development/web/nodejs/default.nix pkgs/os-specific/linux/pam/default.nix pkgs/os-specific/linux/systemd/default.nix pkgs/stdenv/generic/setup.sh pkgs/stdenv/linux/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-small.nix		2014-08-23 16:04:53 +02:00
..
csslint	csslint: update from 0.5.0 to 0.10.0	2013-12-18 18:18:23 +02:00
nodejs	Merge 'staging' into multiple-outputs	2014-08-23 16:04:53 +02:00
remarkjs	remarkjs: Update from 0.6.4 to 0.6.5	2014-08-13 12:03:51 +02:00
twitter-bootstrap	New package: Twitter Bootstrap 2.3.2, a front-end framework for web development.	2013-07-01 16:14:52 +02:00
xmlindent	xmlindent: New expression	2014-02-01 19:10:01 +01:00