| commit | c0312dcbe714bd986ff664b3d646e71ff34ea0f6 | |
| author | Henrik Tidefelt <tidefelt@isy.liu.se> | |
| Mon, 19 May 2008 11:25:46 +0000 (19 13:25 +0200) | ||
| committer | Henrik Tidefelt <tidefelt@isy.liu.se> | |
| Mon, 19 May 2008 11:25:46 +0000 (19 13:25 +0200) | ||
| tree | 0c0240eb135ad668e3f9f5b33702a52187c480e5 | treesnapshot (tar.gz zip) |
| parent | 31ecd710be0b7331262c6b6a3b05188df20661a5 | commitdiff |
| parent | 970b4d0a086219f5311d1dee37d0a4329fed0df2 | commitdiff |
Merge branch 'master' into next
* master:
Added the point-painting function "spot".
Conflicts:
source/globals.cc
source/globals.h
* master:
Added the point-painting function "spot".
Conflicts:
source/globals.cc
source/globals.h
| doc/parts/man/tool-interface.sxml | diff1 | diff2 | blobhistory |
| source/globals.cc | diff1 | diff2 | blobhistory |
| source/globals.h | diff1 | diff2 | blobhistory |
| source/main.cc | diff1 | diff2 | blobhistory |