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/sugar.jhbuildrc | |
| 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/sugar.jhbuildrc')
| -rw-r--r-- | jhbuild/sugar.jhbuildrc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/jhbuild/sugar.jhbuildrc b/jhbuild/sugar.jhbuildrc deleted file mode 100644 index cbf1ced..0000000 --- a/jhbuild/sugar.jhbuildrc +++ /dev/null @@ -1,9 +0,0 @@ -use_local_modulesets = True -modulesets_dir = os.path.join(os.path.dirname(__file__), 'config/modulesets') -jhbuildbot_slaves_dir = os.path.join(os.path.dirname(__file__), 'sbuildbot') -jhbuildbot_mastercfg = os.path.join(os.path.dirname(__file__), 'sbuildbot', 'master.cfg') -jhbuildbot_dir = os.path.join(os.path.dirname(__file__), 'sbuildbot') - -moduleset = 'sugar-tutorius' -modules = ['meta-sugar'] - |