Skip to content

Commit 1516c00

Browse files
committed
Merge remote-tracking branch 'origin/master' into cmake_changes
# Conflicts: # .travis.yml # CMakeLists.txt
2 parents 143a210 + 37025a5 commit 1516c00

File tree

3 files changed

+284
-237
lines changed

3 files changed

+284
-237
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ deploy:
5050
secure: "fAXQOEZd83GYDVDw+KOHEJwKWAD/ILVlT9vWl6FNQkjltIBVp0PpbkgRr/fQcGrQno7UMUZdPm+OIbWAq+0d675SoeZ8NFjGd884SzjslWauB8kRG7iK72Y0EAYqRHl83XqdspuCcBE24fU95C87DbQdhp/zmKi+NB8n3m0X4ifw2G6CNpUdaj9Oxq7dDIQikUTynmmIlTMXtNLr8aQRBihLVpMoIuWLyjskyxPuRU+jFkM0xAeyqy246ZFg0eK2HTIqhlSA/HJHlPHF0gBDxnjca5ZIGYC7s5rr03ghSIMAr6nLHCmAelWPp3+znwTzJ5mGv+4vKwOvOi3EMpCDtsDbh0ybMkSr3tdJzJ9TEsgZ6MIqC2X9bwKtQcW/cmSeJmmpUVhaIZ7KjYS3cIxlQ+jU0aIZupsf0P73rovTfNWuC919H9Ggu/Mc3rELwBUZ1FctxDFZ13cM1gnpbAZXA0xZGGK0AV3Y9M1BQ/RBcnez2OT7DAwYofYe2VAnvMJbYkJUKVVMsKZqPF+9fXGYhtVTpKw3j89nE98xRkIKiWQBmUE6x5XPSgxsI1CaDBIuZiXDO/IMh2v3HGiFlOC8qAuV6Z1vdHbaIFtzPkVEZ1miMBbD3XPki3Crl4kVXtGrCPAl6uH3YVrats9CL6shfgwzsS52zBacQxQu7RCrT6U="
5151
file_glob: true
5252
file: "$TRAVIS_BUILD_DIR/build/*.{deb,pkg}"
53+
5354
skip_cleanup: true
5455
on:
5556
repo: mauroc/squiddio_pi

0 commit comments

Comments
 (0)