Domen Kožar d562934ee7 nokogiri: use libiconvOrEmpty. assert libiconv is not used on linux		2014-11-22 21:13:22 +01:00
..
applications	mr: update to 1.20141024	2014-11-22 09:30:30 -05:00
build-support	Fix patchelf RPM builds	2014-11-20 13:19:36 +01:00
data	Symbola: bump from 7.17 to 7.18	2014-11-18 15:20:26 +01:00
desktops	e17.terminology: update from 0.5.1 to 0.7.0	2014-11-17 18:11:03 +00:00
development	nokogiri: use libiconvOrEmpty. assert libiconv is not used on linux	2014-11-22 21:13:22 +01:00
games	Merge pull request #5046 from abbradar/checksum-fixes	2014-11-19 18:02:09 +01:00
misc	Merge branch 'chromium'.	2014-11-22 04:34:16 +01:00
os-specific	kernel: 3.12.32 -> 3.12.33	2014-11-21 14:39:15 -08:00
servers	Merge pull request #4991 from offlinehacker/nixos/etcd	2014-11-22 12:05:35 +01:00
shells	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
stdenv	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
test	Merge recent master into staging	2014-09-13 21:48:29 +02:00
tools	Merge pull request #5082 from robberer/pkgs/clamav	2014-11-22 10:35:21 +00:00
top-level	Merge branch 'chromium'.	2014-11-22 04:34:16 +01:00