genebean/Trimage
1
0
Fork 0
mirror of https://github.com/Kilian/Trimage.git synced 2026-01-26 01:58:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://github.com/kalmi/Trimage into parallel

Browse source 
Conflicts:
	src/trimage/trimage.py
This commit is contained in:
Kilian Valkhof 2010-04-02 12:57:59 +02:00
commit 0f5092e10b
6 changed files with 83 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
website/index.html
View file

@ -123,7 +123,7 @@
<ul>
<li>Neil Wallace</li>
<li>Jeroen Goudsmit</li>
<li>Kálmán Tarnay</li>
<li>Tarnay Kálmán</li>
</ul>
</div>
<div class="block">