commit a1f468e1624a61c93ea3135da64aa3a712f05d3f
author Radek Krejci <rkrejci@cesnet.cz> Tue Apr 19 15:48:32 2016 +0200
committer Radek Krejci <rkrejci@cesnet.cz> Tue Apr 19 15:48:32 2016 +0200
tree d390f1657cbb2157cd5e9291ce9bd4390f77a691
parent 7ce7f5b4432bbbf5f6ea02802182d528f50d4455
parent 56fae73d0af9e3d763a628a5a4889d6ea5650fcf

Merge branch 'devel'

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 7755bda..35568f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,6 @@
 branches:
   only:
     - master
-    - devel
 
 before_install:
   - sudo apt-get install -y zlib1g-dev
@@ -30,7 +29,6 @@
 
   - git clone https://github.com/CESNET/libyang.git
   - mkdir libyang/build && cd libyang/build
-  - git checkout devel
   - cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .. && make -j2 && sudo make install
   - cd ../..
 

README.md

diff --git a/README.md b/README.md
index ea92369..8bac2be 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,9 @@
 [![Build Status](https://secure.travis-ci.org/CESNET/libnetconf2.png?branch=master)](http://travis-ci.org/CESNET/libnetconf2)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/7642/badge.svg)](https://scan.coverity.com/projects/7642)
 
+TravisCI:
+[![Build Status](https://secure.travis-ci.org/CESNET/libnetconf2.png?branch=master)](http://travis-ci.org/CESNET/libnetconf2)
+
 **libnetconf2** is a NETCONF library in C intended for building NETCONF clients
 and servers. NETCONF is the [NETwork CONFiguration protocol]
 (http://trac.tools.ietf.org/wg/netconf/trac/wiki) introduced by IETF.