Merge branch 'file_transfers'

Browse source

Conflicts:
	src/mainscreen.py

...

This commit is contained in:

ingvar1995 2016-03-22 20:32:29 +03:00

parent cd93d84dfd 6ffa15b4d7

commit 4c1a02c9a3

15 changed files with 520 additions and 43 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

src/images/accept.png Executable file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 469 B

BIN

src/images/decline.png Executable file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.2 KiB