diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-02-26 23:21:09 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-02-26 23:21:09 +0300 |
| commit | 63b31ef91b562a1a4aa95991323555a140dd6ede (patch) | |
| tree | 4287fcc7edc5e01efbd4b26d7c923c9b0cd8d830 /source/blender/blenkernel/intern/idcode.c | |
| parent | 745e396d63ed15fa69203e04840597112498ec3b (diff) | |
| parent | 2f0d93ba563ae2c87a088f21113d5559ab9abfc4 (diff) | |
Merged changes in the trunk up to revision 35203.
Conflicts resolved:
source/creator/creator.c
source/blender/python/intern/bpy.c
Diffstat (limited to 'source/blender/blenkernel/intern/idcode.c')
| -rw-r--r-- | source/blender/blenkernel/intern/idcode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/idcode.c b/source/blender/blenkernel/intern/idcode.c index e4086827e5d..c63d1e45da8 100644 --- a/source/blender/blenkernel/intern/idcode.c +++ b/source/blender/blenkernel/intern/idcode.c @@ -1,4 +1,4 @@ -/** +/* * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** |