diff options
| author |  Alexey Yakovenko <waker@users.sourceforge.net> | 2014-02-07 22:34:06 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <waker@users.sourceforge.net> | 2014-02-07 22:34:06 +0100 |
| commit | 76d88f0625b91d4d97f5b70637210d64d331633a (patch) | |
| tree | 13f6afbdc56cd54beb0fcdd71573e369e95ea690 | |
| parent | 4c8b6aec8c707864d27b3728452e42aa2a2185b4 (diff) | |
| parent | 62d5e529547195b87740578c3152dea63eb0f5fd (diff) | |
Merge branch 'master' of ssh://git.code.sf.net/p/deadbeef/code
Conflicts:
.travis.yml
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index fe398266..00000000 --- a/.travis.yml +++ /dev/null @@ -1,9 +0,0 @@ -language: c -compiler: - - gcc - - clang - -before_install: - - sudo apt-get update && sudo apt-get install -qq autopoint automake autoconf intltool libgtk2.0-dev libgtk-3-dev libavutil-dev libavformat-dev libavcodec-dev libmad0-dev libwavpack-dev libflac-dev libx11-dev libfaad-dev libasound2-dev libcdio-cdda-dev libcdio-dev libcddb2-dev libsamplerate0-dev libsndfile1-dev libcurl4-nss-dev libdbus-1-dev libpulse-dev libzip-dev libvorbis-dev libimlib2-dev - -script: ./autogen.sh && ./configure --disable-nls && make |