At last... this merge should finally do the trick!
authorJoshua Leung <aligorith@gmail.com>
Thu, 25 Jun 2009 04:33:21 +0000 (04:33 +0000)
committerJoshua Leung <aligorith@gmail.com>
Thu, 25 Jun 2009 04:33:21 +0000 (04:33 +0000)
21073 to 21145

28 files changed:
1  2 
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_channels.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/include/ED_keyframes_draw.h
source/blender/editors/interface/resources.c
source/blender/editors/space_action/action_draw.c
source/blender/editors/space_action/action_edit.c
source/blender/editors/space_action/action_select.c
source/blender/editors/space_file/filesel.c
source/blender/editors/space_graph/graph_draw.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_graph/graph_select.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_ops.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_space.c
source/blender/python/generic/Geometry.c
source/blender/python/generic/quat.c
source/gameengine/Ketsji/KX_GameObject.h

@@@ -1,30 -1,5 +1,30 @@@
 -/* Testing code for new animation system in 2.5 
 - * Copyright 2009, Joshua Leung
 +/**
-  * $Id: anim_sys.c 21023 2009-06-20 04:02:49Z aligorith $
++ * $Id$
 + *
 + * ***** BEGIN GPL LICENSE BLOCK *****
 + *
 + * This program is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU General Public License
 + * as published by the Free Software Foundation; either version 2
 + * of the License, or (at your option) any later version.
 + *
 + * This program is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + * GNU General Public License for more details.
 + *
 + * You should have received a copy of the GNU General Public License
 + * along with this program; if not, write to the Free Software Foundation,
 + * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 + *
 + * The Original Code is Copyright (C) 2009 Blender Foundation, Joshua Leung
 + * All rights reserved.
 + *
 + * The Original Code is: all of this file.
 + *
 + * Contributor(s): Joshua Leung (full recode)
 + *
 + * ***** END GPL LICENSE BLOCK *****
   */
  
  #include <stdio.h>
Simple merge
Simple merge