diff options
author | Simon Poirier <simpoir@Eridani.(none)> | 2009-09-18 15:49:43 (GMT) |
---|---|---|
committer | Simon Poirier <simpoir@Eridani.(none)> | 2009-09-18 15:49:43 (GMT) |
commit | 4c41576c95648cc5741cabc3acb5d9f0bb8b11fc (patch) | |
tree | 42ce7cbad6e75d2cea4e99187617b1b2f337e246 /jhbuild/config/modulesets/sugar-tutorius.modules | |
parent | 057b982d6e4b0d3bf2801ec87fd9430fa2774c0b (diff) | |
parent | 24a02a6fefafb6ff911c568cf38992c2f9107f2c (diff) |
Merge branch 'master' of gitorious@git.sugarlabs.org:tutorius/mainline
Conflicts:
setup.py
toolkitfix/__init__.py
Diffstat (limited to 'jhbuild/config/modulesets/sugar-tutorius.modules')
-rw-r--r-- | jhbuild/config/modulesets/sugar-tutorius.modules | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/jhbuild/config/modulesets/sugar-tutorius.modules b/jhbuild/config/modulesets/sugar-tutorius.modules deleted file mode 100644 index 50cb154..0000000 --- a/jhbuild/config/modulesets/sugar-tutorius.modules +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*--> -<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?> -<moduleset> - - <include href="tools.modules"/> - <include href="glucose-external.modules"/> - <include href="glucose-tutorius.modules"/> - <include href="fructose.modules"/> - <include href="extra.modules"/> - <include href="extra-activities.modules"/> - <include href="buildbot.modules"/> - <metamodule id="meta-sugar"> - <dependencies> - <dep package="meta-tools"/> - <dep package="meta-glucose"/> - <dep package="meta-fructose"/> - </dependencies> - </metamodule> -</moduleset> |