diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-25 02:18:32 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-25 02:18:32 +0400 |
commit | 685b6e7db932db179dd2edb1080d3cf6e2bcde2a (patch) | |
tree | e6c7f4a6b75ed1181d796953e775a7484a3a80f9 /source/blender/makesdna/intern | |
parent | 15e6d6cd75fc484e7ac347d25826e7c3217e95a3 (diff) | |
parent | 82c84f4b58e0d836361a2cadc9ce2941a3d4ff39 (diff) |
svn merge ^/trunk/blender -r41227:41230 . --accept=theirs-full
Diffstat (limited to 'source/blender/makesdna/intern')
-rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index e2526f902b0..39cb1743c25 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -48,7 +48,7 @@ * numbers give more output. * */ -#define DNA_VERSION_DATE "$Id$" +#define DNA_VERSION_DATE "FIXME-DNA_VERSION_DATE" #include <string.h> #include <stdlib.h> |