summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2012-09-24 17:21:19 +0100
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2012-09-24 17:21:19 +0100
commitac44b4eab3e85a7516415c0cdba041505675c9a0 (patch)
treeca52abd5a50b3e66f362cacb7564e32f21590f1d
parent783db2889172c9d3e434a28b87c33de18737deec (diff)
parent3ede89484dbb20ae9d35d730766bc27cdf29ea7b (diff)
downloadlorries-ac44b4eab3e85a7516415c0cdba041505675c9a0.tar.gz
Merge branch 'master' of git://git.baserock.org/baserock/lorries
-rw-r--r--active/jenkinstool.lorry6
-rw-r--r--disabled/gnome-doc-utils.lorry (renamed from active/gnome-doc-utils.lorry)0
-rw-r--r--disabled/rarian.lorry (renamed from active/rarian.lorry)0
3 files changed, 6 insertions, 0 deletions
diff --git a/active/jenkinstool.lorry b/active/jenkinstool.lorry
new file mode 100644
index 0000000..320ad8b
--- /dev/null
+++ b/active/jenkinstool.lorry
@@ -0,0 +1,6 @@
+{
+ "jenkinstool": {
+ "type": "git",
+ "url": "git://git.gitano.org.uk/personal/liw/jenkinstool"
+ }
+}
diff --git a/active/gnome-doc-utils.lorry b/disabled/gnome-doc-utils.lorry
index 8b09f2b..8b09f2b 100644
--- a/active/gnome-doc-utils.lorry
+++ b/disabled/gnome-doc-utils.lorry
diff --git a/active/rarian.lorry b/disabled/rarian.lorry
index ea67f39..ea67f39 100644
--- a/active/rarian.lorry
+++ b/disabled/rarian.lorry