AEtHeLsYn
|
9db45c0ffb
|
Merge remote-tracking branch 'refs/remotes/tvdzwan/master'
# Conflicts:
# include/hyperion/Hyperion.h
# libsrc/hyperion/CMakeLists.txt
# libsrc/hyperion/Hyperion.cpp
Former-commit-id: 1144520581d4531952038d2118cb11e01bebc10e
|
2016-03-09 19:25:04 +01:00 |
|
poljvd
|
b50611fef7
|
add protobuf as submodule
Former-commit-id: 56497c61fa8403b489c1fc7ca45a9d2e964a4e10
|
2014-12-19 21:21:00 +01:00 |
|
T. van der Zwan
|
fdaa5c0068
|
Added tinkerforge as local dependency
Former-commit-id: b739eba0676d9c105416d9040ffbe78b2dc4bfbd
|
2014-03-06 21:48:11 +01:00 |
|
T. van der Zwan
|
747e0dbfae
|
Added build-x86 to ignore
Former-commit-id: 7e901bcbbe26033902b446f4c85680d8017ccfdb
|
2013-11-20 09:05:21 +00:00 |
|
T. van der Zwan
|
50bb43f1ec
|
Added missing dependency of last commit (serial)
Former-commit-id: 2f50af95f36600716e14d5e884ddd7b55ae982fc
|
2013-11-05 19:26:33 +00:00 |
|
T. van der Zwan
|
b411b166ae
|
Updated ignore to exclude build from git
|
2013-08-14 08:54:01 +00:00 |
|
T. van der Zwan
|
a65305dbdb
|
Added txt-document with first draft of cross-compile info.
Added cmake temp stuff to ignore.
|
2013-08-01 07:39:23 +00:00 |
|