Merge branch 'master' of git+ssh://gitbox/piccreate

Browse Source

Conflicts:
	bin/webscan
	cfg/webscan.cfg
	libs/CutyCapt/CutyCapt.cpp
	libs/CutyCapt/CutyCapt.hpp
	libs/CutyCapt/CutyCapt.o
	libs/CutyCapt/CutyCapt.pro
	libs/CutyCapt/Makefile
	libs/CutyCapt/google.jpg
	libs/CutyCapt/moc_CutyCapt.cpp
	libs/CutyCapt/moc_CutyCapt.o
	libs/CutyCapt/readme.txt

...

This commit is contained in:

Kamil Bugajski

2012-09-19 10:34:00 +02:00

parent 6109588792 679cd04724

commit 6f77f4dbc4

2 changed files with 3 additions and 6 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

libs/CutyCapt/google.jpg

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 8.0 KiB After Width:  |  Height:  |  Size: 0 B