merge trunk 17122:17213
[blender.git] / source / blender / imbuf / intern / imginfo.c
2008-03-13 Jean-Luc Peurièreresolved conflict state with HEAD r14096
2007-11-26 Brecht Van LommelParticles
2007-11-06 Martin PoirierFilling in branch from trunk
2007-10-22 Daniel Genrichsvn merge -r 12294:12347 https://svn.blender.org/svnroo...
2007-10-20 Campbell BartonImage Stamping patch by Diego (and peach request)-...
2007-09-05 Andrea Weikertfix svn properties for line endings
2007-09-02 Andrea Weikert== imagebrowser ==