Collada: commented out code was previously left over with an unresolved conflict...
[blender.git] / source / blender / collada / ExtraTags.cpp
2016-06-01 Bastien MontagneMerge branch 'master' into blender2.8
2016-05-28 Gaia ClaryCollada: Adding support for bone roll and bone layers
2013-07-09 Mitchell StokesCreating a BGE staging branch.
2012-06-17 Ove Murberg Henriksensvn merge ^/trunk/blender -r47023:HEAD
2012-06-15 Tamito KajiyamaMerged changes in the trunk up to revision 47977.
2012-06-14 Sergey SharybinKaying node from tomato branch
2012-06-14 Campbell Bartonsvn merge ^/trunk/blender -r47805:47873
2012-06-12 Campbell Bartonstyle cleanup
2012-04-14 Sergey SharybinMerging r44227 through r45619 from trunk into soc-2011...
2012-04-03 Ove Murberg Henriksensvn merge ^/trunk/blender -r44562:45364
2012-03-25 Tamito KajiyamaMerged changes in the trunk up to revision 45133.
2012-03-24 Campbell Bartonstyle cleanup: follow style guide for/with/if spacing
2011-10-30 Tamito KajiyamaMerged changes in the trunk up to revision 41368.
2011-10-28 Miika HamalainenMerge with trunk r41342
2011-10-24 Brecht Van LommelCycles: svn merge -r41225:41232 ^/trunk/blender
2011-10-24 Sergey SharybinMerging trunk up to revision 41245.
2011-10-24 Campbell Bartonsvn merge ^/trunk/blender -r41226:41227 .
2011-10-23 Campbell Bartonremove $Id: tags after discussion on the mailign list...
2011-09-17 Brecht Van LommelCycles: svn merge -r39870:r40266 https://svn.blender...
2011-09-15 Sergey Sharybinsvn merge -r39834:40222 https://svn.blender.org/svnroot...
2011-09-13 Campbell Bartonsvn merge -r39800:39900 https://svn.blender.org/svnroot...
2011-09-07 Benoit Bolseesvn merge -r 37306:39975 https://svn.blender.org/svnroo...
2011-09-07 Sergey SharybinMerging r39717 through r39983 from trunk into soc-2011...
2011-09-06 Campbell Bartonsvn merge -r39890:39951 https://svn.blender.org/svnroot...
2011-09-05 Miika HamalainenMerge with trunk r39928
2011-09-05 Bastien MontagneMerging r39847 through r39930 from trunk into vgroup_mo...
2011-09-03 Tamito KajiyamaMerged changes in the trunk up to revision 39896.
2011-09-03 Campbell Bartonwarning fixes
2011-07-16 Joshua LeungBugfix [#27157] keyframing a constrained bone does...
2011-06-08 Mike Erwinmigrated NDOF code from soc-2010-merwin, SpaceNavigator...
2011-05-16 Nick Samarinsynched with trunk at revision 36569
2011-04-15 Joseph Eagar=bmesh= merge from trunk at r36153
2011-04-03 Tamito KajiyamaMerged changes in the trunk up to revision 35972.
2011-03-30 Nathan LetworyCOLLADA lights:
2011-03-28 Guillermo S. RomeroSVN maintenance.
2011-03-28 Nathan LetworyAdd missing header for *nix machines.
2011-03-28 Nathan LetworyImport light blender profile if it exists.
2011-03-27 Tamito KajiyamaMerged changes in the trunk up to revision 35828.
2011-03-27 Nathan LetworyAdd blender light profile.
2011-03-26 Guillermo S. RomeroSVN maintenance.
2011-03-25 Nathan LetworyAdd ExtraTags class for handling tags inside an extra...