diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2015-03-27 17:09:23 +0100 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2015-03-27 17:09:23 +0100 |
| commit | c18222560943f958cfb0e8498232f732ca4d6a96 (patch) | |
| tree | 63b490003e73c62b3d0e23a3745b07ac386baec2 /.gitignore | |
| parent | bd174539d8bb2921bef94cccd994a61e334a3dd7 (diff) | |
| parent | fa20b967896e3332078b6e2a4b3ca7e98a0b43f0 (diff) | |
| download | mavigator-c18222560943f958cfb0e8498232f732ca4d6a96.tar.gz mavigator-c18222560943f958cfb0e8498232f732ca4d6a96.tar.bz2 mavigator-c18222560943f958cfb0e8498232f732ca4d6a96.zip | |
Merge branch 'wip/mavlink-common'
Conflicts:
vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Communication.scala
vfd-dashboard/src/main/scala/vfd/dashboard/ui/panels/Primary.scala
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -26,4 +26,5 @@ project/plugins/project/ *.class *.log *~ +/.idea |