Files
nixpkgs/pkgs/applications/editors
Eelco Dolstra d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates
Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix
2012-09-26 14:51:51 -04:00
..
2012-09-14 23:24:10 +02:00
2012-08-04 11:14:02 -07:00
2011-12-12 23:44:49 +00:00
2012-04-09 20:51:04 +00:00
2012-08-27 18:16:06 +02:00
2011-10-08 12:06:03 +00:00
2012-07-31 16:30:50 -04:00
2012-08-31 12:20:09 +04:00
2012-06-28 14:50:44 +02:00
2011-09-04 23:05:57 +00:00
2012-09-19 13:56:56 -04:00
2012-04-09 20:50:50 +00:00