diff options
author | Marco Pesenti Gritti <marco@marcopg.org> | 2009-01-06 12:58:50 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@marcopg.org> | 2009-01-06 12:58:50 (GMT) |
commit | a0a88a51b8498726f6544b85ba0cb93d00c9d7a9 (patch) | |
tree | 4a0ed0a5943e830555b21b4995d5a13cb03a4078 | |
parent | fd58c0324d9ff7684f7faa0b28cd3de4efe86508 (diff) | |
parent | d3d582c43f22b7b1d9c457d7cb4183db1fba1b1d (diff) |
Merge branch 'master' of git://git.sugarlabs.org/sugar-jhbuild/mainline
-rw-r--r-- | config/modulesets/fructose.modules | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config/modulesets/fructose.modules b/config/modulesets/fructose.modules index 0623208..8afeddd 100644 --- a/config/modulesets/fructose.modules +++ b/config/modulesets/fructose.modules @@ -24,8 +24,8 @@ <bundle id="read"> <branch module="read/mainline.git" checkoutdir="read"/> </bundle> - <bundle id="terminal-activity"> - <branch repo="dev.laptop.org/projects" /> + <bundle id="terminal"> + <branch module="terminal/mainline.git" checkoutdir="terminal" /> </bundle> <bundle id="write"> <branch repo="dev.laptop.org/projects" /> @@ -42,8 +42,8 @@ <bundle id="pippy-activity"> <branch repo="dev.laptop.org/projects" /> </bundle> - <bundle id="imageviewer-activity"> - <branch repo="dev.laptop.org/users/sayamindu" /> + <bundle id="imageviewer"> + <branch module="imageviewer/mainline.git" checkoutdir="imageviewer" /> </bundle> <bundle id="turtleart"> <branch module="turtleart/mainline.git" checkoutdir="turtleart"/> @@ -59,11 +59,11 @@ <dep package="browse"/> <dep package="chat"/> <dep package="write"/> - <dep package="terminal-activity"/> + <dep package="terminal"/> <dep package="calculate"/> <dep package="log-activity"/> <dep package="pippy-activity"/> - <dep package="imageviewer-activity"/> + <dep package="imageviewer"/> <dep package="turtleart"/> <dep package="jukebox"/> </dependencies> |