William A. Kennington III 916b95b829 gnutls: 3.4.0 -> 3.4.1		2015-05-08 06:05:43 -07:00
..
applications	Merge branch 'master' into staging	2015-05-08 05:59:50 -07:00
build-support	Merge branch 'master' into staging	2015-05-08 05:59:50 -07:00
data	Merge remote-tracking branch 'upstream/master' into staging	2015-05-07 01:44:49 -07:00
desktops	kde4.kopete: fix build	2015-05-07 21:49:54 -05:00
development	gnutls: 3.4.0 -> 3.4.1	2015-05-08 06:05:43 -07:00
games	Merge remote-tracking branch 'upstream/master' into staging	2015-05-07 01:44:49 -07:00
misc	Merge remote-tracking branch 'upstream/master' into staging	2015-05-07 01:44:49 -07:00
os-specific	Merge branch 'master' into staging	2015-05-08 05:59:50 -07:00
servers	Merge branch 'master' into staging	2015-05-08 05:59:50 -07:00
shells	pythonPackages.ipython: 2.3.1 -> 3.1.0	2015-05-02 22:05:07 +02:00
stdenv	Merge pull request #7740 from dezgeg/arm	2015-05-07 20:53:07 +02:00
test
tools	Merge branch 'master' into staging	2015-05-08 05:59:50 -07:00
top-level	Merge branch 'master' into staging	2015-05-08 05:59:50 -07:00