Benjamin Staffin 560c3bb9a9 Merge pull request #13578 from Baughn/prometheus ... Prometheus: Misc updates		2016-03-04 18:25:33 -08:00
..
applications	chromium/updater: Fix eval error on stdenv.is32bit	2016-03-05 03:16:26 +01:00
build-support	haskell: Rename file where buildStackProject is defined.	2016-03-04 21:18:14 +01:00
data	Merge pull request #13621 from DamienCassou/add-gentium-book-basic	2016-03-02 19:20:58 +01:00
desktops	kde5.plasma.plasma-workspace: 5.5.5.1 -> 5.5.5.2	2016-03-03 05:57:09 -06:00
development	haskell-generic-stack-builder: strip trailing whitespace	2016-03-04 22:18:08 +01:00
games	Merge pull request #13664 from tomberek/minecraft-server-update	2016-03-04 23:05:48 +03:00
misc	Merge pull request #13483 from hrdinka/add/libretro-mame	2016-03-04 10:50:10 +01:00
os-specific	android-udev-rules: 20151209 -> 2016-03-03	2016-03-04 14:46:30 +03:00
servers	nginx, nginxUnstable: hardening: only use when the compiler is gcc	2016-03-04 16:57:47 +01:00
shells	Merge pull request #13368 from nathan7/fish-ul	2016-02-28 22:09:32 +00:00
stdenv	make-bootstrap-tools: fix #13629: glibc problems	2016-03-03 12:09:50 +01:00
test
tools	ceph: fix for zip timestamps	2016-03-04 14:15:59 +00:00
top-level	Merge pull request #13578 from Baughn/prometheus	2016-03-04 18:25:33 -08:00