Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

V

visual_recognition_challenge
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

69856f62

Commit 69856f62 authored 6 years ago by Millot Lucas

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ImageRec.py
#	display.py

parents c34637cf 302407ef

Branches master

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

ImageRec.py 1 addition, 1 deletion

ImageRec.py
display.py 6 additions, 6 deletions

display.py
interface_tkinter.py 28 additions, 0 deletions

interface_tkinter.py
test_twitter_to_images.py 18 additions, 4 deletions

test_twitter_to_images.py
twitter_to_images.py 2 additions, 0 deletions

twitter_to_images.py

with 55 additions and 11 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