Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

plante-qui-pleure
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

373ecec5

Commit 373ecec5 authored 6 years ago by Salles Coralie

Downloads
- Plain Diff

merge conflict

parents 0e3a32e3 cc794012

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/.gitignore 1 addition, 0 deletions

app/.gitignore
app/src/BluetoothJavaServer/src/edu/kufpg/bluetooth/server/BluetoothManager.java 153 additions, 0 deletions

...rver/src/edu/kufpg/bluetooth/server/BluetoothManager.java
app/src/BluetoothJavaServer/src/edu/kufpg/bluetooth/server/BluetoothThread.java 29 additions, 22 deletions

...erver/src/edu/kufpg/bluetooth/server/BluetoothThread.java
app/src/Vue/FXMLVueController.java 22 additions, 0 deletions

app/src/Vue/FXMLVueController.java
app/src/app/.classpath 5 additions, 0 deletions

app/src/app/.classpath
app/src/app/.project 17 additions, 0 deletions

app/src/app/.project
app/src/app/App.java 3 additions, 104 deletions

app/src/app/App.java
core/thingz.ino.txt 20 additions, 2 deletions

core/thingz.ino.txt

with 250 additions and 128 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment