diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-30 06:03:40 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-30 06:03:40 +0400 |
commit | 65668dc5eb45ae6e90675aecc9dd6132dc7f0b5e (patch) | |
tree | 355f3b4dd6f28dc0debf249d1c85a6474784dcfe /intern/ghost/GHOST_IEvent.h | |
parent | 16702c172939a399ddd0e61fc14a8b0944c4249b (diff) | |
parent | 15bd96efeb77cf33215613a53059f01db7242b31 (diff) |
Merged changes in the trunk up to revision 41368.
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c
Diffstat (limited to 'intern/ghost/GHOST_IEvent.h')
-rw-r--r-- | intern/ghost/GHOST_IEvent.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/intern/ghost/GHOST_IEvent.h b/intern/ghost/GHOST_IEvent.h index bb13179fbfe..4e181b91c9e 100644 --- a/intern/ghost/GHOST_IEvent.h +++ b/intern/ghost/GHOST_IEvent.h @@ -1,5 +1,4 @@ /* - * $Id$ * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or |