Skip to content

Commit 80e5f50

Browse files
obscurenobscuren
committed
Merge branch 'develop'
2 parents 98f4c93 + 26f8387 commit 80e5f50

File tree

1,115 files changed

+12520
-11942
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,115 files changed

+12520
-11942
lines changed

‎.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
language: go
22
go:
33
- 1.4.2
4-
before_install:
5-
- sudo apt-get update -qq
6-
- sudo apt-get install -yqq libgmp3-dev
74
install:
85
# - go get code.google.com/p/go.tools/cmd/goimports
96
# - go get github.com/golang/lint/golint
@@ -22,7 +19,11 @@ after_success:
2219
env:
2320
global:
2421
- secure: "U2U1AmkU4NJBgKR/uUAebQY87cNL0+1JHjnLOmmXwxYYyj5ralWb1aSuSH3qSXiT93qLBmtaUkuv9fberHVqrbAeVlztVdUsKAq7JMQH+M99iFkC9UiRMqHmtjWJ0ok4COD1sRYixxi21wb/JrMe3M1iL4QJVS61iltjHhVdM64="
25-
22+
sudo: false
23+
addons:
24+
apt:
25+
packages:
26+
- libgmp3-dev
2627
notifications:
2728
webhooks:
2829
urls:

‎Godeps/Godeps.json

Lines changed: 1 addition & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Godeps/_workspace/src/github.com/huin/goupnp/httpu/httpu.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Godeps/_workspace/src/github.com/huin/goupnp/soap/soap.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Godeps/_workspace/src/github.com/jackpal/go-nat-pmp/natpmp.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Godeps/_workspace/src/github.com/rakyll/globalconf/.travis.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎Godeps/_workspace/src/github.com/rakyll/globalconf/README.md

Lines changed: 0 additions & 144 deletions
This file was deleted.

0 commit comments

Comments
 (0)