Kamil Bugajski 6f77f4dbc4 Merge branch 'master' of git+ssh://gitbox/piccreate ...

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

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

backgrounds

- karopapier als Hintergrund dazu

2012-08-16 16:59:48 +02:00

bin

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

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

cfg

webscan eingefügt

2012-09-19 10:15:42 +02:00

fonts

- neuer Font umbenannt

2012-08-21 23:47:26 +02:00

in

- config und Liste für Punkterätsel noch einmal für die verbundene

2012-08-20 15:11:01 +02:00

libs

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

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

out

- meins rein

2012-07-18 10:39:02 +02:00

S

Description

No description provided

5.8 MiB

Languages

Python 86%

Batchfile 7.5%

Shell 6.5%