resolved conflict state with HEAD r14096
[blender.git] / source / blender / avi / intern / options.c
2008-03-13 Jean-Luc Peurièreresolved conflict state with HEAD r14096
2008-02-04 Hamed Zaghaghimerging game_engine branch changes into trunk, 2d-filte...
2007-11-26 Brecht Van LommelParticles
2007-11-06 Martin PoirierFilling in branch from trunk
2007-10-21 Peter Schlaile== Core ==
2002-11-25 Kent Meinupdated .c files to include:
2002-10-12 Hans LambermontInitial revision v2.25