diff options
author | irungentoo <irungentoo@gmail.com> | 2013-07-30 18:00:59 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2013-07-30 18:00:59 -0400 |
commit | c58ffba4f05ac839f656e212463b2b9129d851dc (patch) | |
tree | d6cca2ccc6abe7a3dfb008f96c539f3cb88421e8 /.travis.yml | |
parent | 010adbe0ac936ab5393920aa2ebcc9cd7470ca10 (diff) | |
parent | ee1a0f5accf5d972a00274c9937d60a2abe911c5 (diff) |
Merge branch 'master' into nurupo-master
Conflicts:
.travis.yml
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index d295249a..8e71c327 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -22,6 +22,7 @@ before_script: | |||
22 | # creating librarys' links and updating cache | 22 | # creating librarys' links and updating cache |
23 | - sudo ldconfig | 23 | - sudo ldconfig |
24 | 24 | ||
25 | |||
25 | script: | 26 | script: |
26 | - mkdir build && cd build | 27 | - mkdir build && cd build |
27 | - cmake .. | 28 | - cmake .. |