3 Commits

Author	SHA1	Message	Date
Eelco Dolstra	da607b2110	Indent sensibly	2013-12-03 09:22:58 -05:00
Eelco Dolstra	929b7bdc4b	Merge remote-tracking branch 'origin/master' into glibc-2.18 ... Conflicts: pkgs/development/libraries/glibc/2.17/locales.nix	2013-12-03 09:22:24 -05:00
Eelco Dolstra	5b22285b53	glibc: Move 2.17 -> 2.18	2013-11-15 12:26:37 +01:00