William A. Kennington III 074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging		2015-05-07 01:44:49 -07:00
..
applications	Merge remote-tracking branch 'upstream/master' into staging	2015-05-07 01:44:49 -07:00
build-support	Merge remote-tracking branch 'upstream/master' into staging	2015-05-07 01:44:49 -07:00
data	Merge remote-tracking branch 'upstream/master' into staging	2015-05-07 01:44:49 -07:00
desktops	plasma53: fix kcm_keyboard	2015-05-06 07:08:20 -05:00
development	Merge remote-tracking branch 'upstream/master' into staging	2015-05-07 01:44:49 -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 remote-tracking branch 'upstream/master' into staging	2015-05-07 01:44:49 -07:00
servers	Merge remote-tracking branch 'upstream/master' into staging	2015-05-07 01:44:49 -07:00
shells	pythonPackages.ipython: 2.3.1 -> 3.1.0	2015-05-02 22:05:07 +02:00
stdenv	Merge remote-tracking branch 'upstream/master' into staging	2015-05-07 01:44:49 -07:00
test
tools	Merge remote-tracking branch 'upstream/master' into staging	2015-05-07 01:44:49 -07:00
top-level	Merge remote-tracking branch 'upstream/master' into staging	2015-05-07 01:44:49 -07:00