Commit graph

4 commits

Author SHA1 Message Date
Vladimír Čunát a2c316288c Merge master into stdenv-updates
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
Moritz Heidkamp b10fe8ae3f stumpwm: Copy stumpish to bin/, add contrib/ directory. 2014-01-05 17:38:14 +00:00
Peter Simons 6be8ad3392 Merge branch 'origin/master' into stdenv-updates.
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Michael Raskin 4129c4e735 Adding fresh StumpWM built via lisp-packages 2013-10-13 10:58:48 +04:00