Merge remote-tracking branch 'origin/devel' into devel

hacking-thursday · Nov 14, 2014 · d688060 · d688060
2 parents 2e55a42 + 1ec228b
commit d688060
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,6 @@
+language:
+    -   golang
+
+script:
+    -   ./configure
+    -   make
diff --git a/pkg/deb/debian/watch b/pkg/deb/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://github.com/hacking-thursday/sysd/releases .*/v?(\d\S*)/sysd-(?:\d\S*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))