Shea Levy 6d64b1d92c Give unique keys to submodule components ... I'm not wed to the outPath values I chose, other options are probably valid there too. It would be nice if we could track which file each merged value came from as well. Signed-off-by: Shea Levy <shea@shealevy.com>		2013-06-07 03:42:46 -04:00
..
applications	firefox: Update to 21.0	2013-06-06 13:07:54 +02:00
build-support	fetchsvn: Allow setting the name of the output	2013-05-26 11:58:01 -04:00
data
desktops	KDE 4.10: update to 4.10.4	2013-06-05 19:41:28 +03:00
development	Merge pull request #593 from bjornfor/saleae-logic	2013-06-06 04:44:44 -07:00
games
lib	Give unique keys to submodule components	2013-06-07 03:42:46 -04:00
misc
os-specific	adding unfree-redistributable-firmware	2013-06-05 22:44:17 +02:00
servers	mysql-connector-java: Updated to 5.1.25	2013-06-02 23:40:18 +02:00
shells	fish: Add fish 2.0.0	2013-06-04 10:20:30 +01:00
stdenv
test
tools	Added openconnect	2013-06-06 10:48:58 +02:00
top-level	Merge pull request #593 from bjornfor/saleae-logic	2013-06-06 04:44:44 -07:00