Skip to content

Nmct12 emodetection#20

Open
HypiTheFox wants to merge 15 commits intomasterfrom
NMCT12_EmoDetection
Open

Nmct12 emodetection#20
HypiTheFox wants to merge 15 commits intomasterfrom
NMCT12_EmoDetection

Conversation

@HypiTheFox
Copy link

No description provided.

HypiTheFox and others added 15 commits May 24, 2016 15:50
This is the first official commit. Just to test if branches work fine.
Hope it does, of course :)
Better alts in blockly & small fix in detection.py
Blockly blocks toegevoed + lua code achter blocks
…_EmoDetection

# Conflicts:
#	OnoSW/apps/visprog/static/custom_blocks/detection.js
#	OnoSW/apps/visprog/templates/blockly.html
#	OnoSW/detection.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

Comments