Vladimír Čunát 1e389c976c merge 'staging' into modular-stdenv ... In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix were not merged correctly. Conflicts: pkgs/stdenv/generic/default.nix		2014-09-08 18:16:54 +02:00
..
csslint	csslint: update from 0.5.0 to 0.10.0	2013-12-18 18:18:23 +02:00
nodejs	Cleanup: Use += to append to envHooks	2014-08-09 12:47:05 +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