On branch master
	deleted:    AVR/Makefile~
	modified:   RaspberryPI/RaspberryPI.pro.user
	modified:   RaspberryPI/mainwindow.cpp
	modified:   RaspberryPI/mainwindow.h
Merge branch 'master' of https://github.com/maruncz/RaspberryPI-tablet

Conflicts:
	AVR/Makefile~