Commit Graph

5 Commits

Author SHA1 Message Date
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Lluís Batlle i Rossell
cce9e298b8 Changing the source of skype4pidgin
This github fork works fine, while the previous (original) only segfaults.
2013-04-16 14:53:59 +02:00
Lluís Batlle i Rossell
9216b0598c Adding skype4pidgin. It crashes. 2013-04-16 14:53:59 +02:00