[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40339] branches/soc-2011-radish: svn merge ^/trunk/blender -r40311:40338
Campbell Barton
ideasman42 at gmail.com
Mon Sep 19 07:58:53 CEST 2011
Revision: 40339
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40339
Author: campbellbarton
Date: 2011-09-19 05:58:52 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r40311:40338
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40311
Modified Paths:
--------------
branches/soc-2011-radish/extern/glew/include/GL/glew.h
branches/soc-2011-radish/extern/glew/include/GL/glxew.h
branches/soc-2011-radish/extern/glew/include/GL/wglew.h
branches/soc-2011-radish/extern/glew/src/glew.c
branches/soc-2011-radish/intern/itasc/kdl/frames.hpp
branches/soc-2011-radish/source/blender/blenfont/BLF_api.h
branches/soc-2011-radish/source/blender/blenfont/intern/blf.c
branches/soc-2011-radish/source/blender/blenfont/intern/blf_dir.c
branches/soc-2011-radish/source/blender/blenfont/intern/blf_font.c
branches/soc-2011-radish/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2011-radish/source/blender/blenfont/intern/blf_lang.c
branches/soc-2011-radish/source/blender/blenfont/intern/blf_util.c
branches/soc-2011-radish/source/blender/blenkernel/intern/sound.c
branches/soc-2011-radish/source/blender/blenloader/intern/readfile.c
branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2011-radish/source/blender/editors/space_nla/nla_edit.c
branches/soc-2011-radish/source/blender/editors/space_nla/nla_select.c
branches/soc-2011-radish/source/blender/editors/space_node/node_edit.c
branches/soc-2011-radish/source/blender/editors/space_node/node_select.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2011-radish/source/blender/windowmanager/intern/wm_init_exit.c
Removed Paths:
-------------
branches/soc-2011-radish/extern/glew/ChangeLog
branches/soc-2011-radish/extern/glew/README.txt
branches/soc-2011-radish/extern/glew/doc/
Property Changed:
----------------
branches/soc-2011-radish/
branches/soc-2011-radish/intern/audaspace/OpenAL/
branches/soc-2011-radish/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-radish
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:40001-40311
+ /trunk/blender:40001-40338
Deleted: branches/soc-2011-radish/extern/glew/ChangeLog
===================================================================
--- branches/soc-2011-radish/extern/glew/ChangeLog 2011-09-19 05:06:21 UTC (rev 40338)
+++ branches/soc-2011-radish/extern/glew/ChangeLog 2011-09-19 05:58:52 UTC (rev 40339)
@@ -1,1703 +0,0 @@
-2005-05-16 00:35 ikits
-
- * auto/src/template.html, doc/advanced.html, doc/basic.html,
- doc/credits.html, doc/index.html, doc/install.html, doc/log.html:
- getting ready for the release
-
-2005-05-16 00:14 ikits
-
- * auto/Makefile: Added option for splitting the source into
- multiple files
-
-2005-05-16 00:13 ikits
-
- * auto/bin/update_ext.sh: Fixed GL_ARB_transpose_matrix bug
-
-2005-04-22 18:47 ikits
-
- * auto/: bin/update_ext.sh, core/GL_VERSION_2_0: fixed bugs 1185517
- and 1182116
-
-2005-04-04 23:49 ikits
-
- * auto/src/: glew_head.c, glew_init_gl.c: fix for OGL 2.0 problem
-
-2005-03-16 21:49 ikits
-
- * config/version: bump version number
-
-2005-03-16 21:48 ikits
-
- * auto/src/glew_init_gl.c: minor issue
-
-2005-03-16 21:04 ikits
-
- * doc/advanced.html, doc/basic.html, doc/credits.html,
- doc/index.html, doc/install.html, doc/log.html,
- auto/src/template.html: getting ready for the release
-
-2005-03-16 20:49 ikits
-
- * ChangeLog: it's that time again
-
-2005-03-16 20:48 ikits
-
- * TODO.txt: fix it when there is time
-
-2005-03-16 20:45 ikits
-
- * auto/src/glew_init_gl.c: added check for crippled hardware
-
-2005-03-14 23:50 ikits
-
- * auto/src/template.html: documentation update
-
-2005-03-14 23:38 ikits
-
- * doc/log.html: update log
-
-2005-03-14 23:24 ikits
-
- * TODO.txt: done
-
-2005-03-14 23:21 ikits
-
- * doc/: advanced.html, basic.html, credits.html, index.html,
- install.html, log.html, glew.css: changes for html 4.01
- compliance
-
-2005-03-14 00:13 ikits
-
- * TODO.txt: oops
-
-2005-03-14 00:10 ikits
-
- * TODO.txt: some more
-
-2005-03-14 00:08 ikits
-
- * TODO.txt: the road ahead
-
-2005-03-14 00:00 ikits
-
- * config/: Makefile.mingw, Makefile.mingw32: fixed bug #1161790
-
-2005-03-13 23:09 ikits
-
- * auto/core/: GL_APPLE_pixel_buffer, GL_EXT_framebuffer_object,
- GL_SGIX_shadow: cleanup and bug fixes; thanks to Stephane for
- these
-
-2005-02-05 02:17 ikits
-
- * auto/core/GL_VERSION_2_0: fixed bug 1116569
-
-2005-02-03 00:25 ikits
-
- * ChangeLog: version bump
-
-2005-02-03 00:21 ikits
-
- * config/version: version bump
-
-2005-02-03 00:13 ikits
-
- * doc/log.html: oops
-
-2005-02-02 23:28 ikits
-
- * doc/index.html: added reference
-
-2005-02-02 22:49 ikits
-
- * doc/install.html: ready for release
-
-2005-02-02 22:34 ikits
-
- * auto/Makefile, auto/src/template.html, doc/advanced.html,
- doc/basic.html, doc/credits.html, doc/glew.css, doc/index.html,
- doc/install.html, doc/log.html: prepare for release
-
-2005-01-30 17:26 ikits
-
- * doc/advanced.html, doc/basic.html, doc/credits.html,
- doc/index.html, doc/install.html, doc/log.html,
- auto/src/template.html: ,
-
-2005-01-30 17:12 ikits
-
- * doc/install.html: corrected VS.NET install location
-
-2005-01-30 01:46 ikits
-
- * auto/src/: glew.rc, glewinfo.rc, visualinfo.rc: added description
- fields
-
-2005-01-30 01:35 ikits
-
- * ChangeLog, doc/log.html: update logs
-
-2005-01-29 20:48 ikits
-
- * auto/Makefile, auto/src/glew.rc, auto/src/glewinfo.rc,
- auto/src/visualinfo.rc, build/vc6/glew_shared.dsp,
- build/vc6/glew_static.dsp, build/vc6/glewinfo.dsp,
- build/vc6/visualinfo.dsp: added resource files for win32
- versioning
-
-2005-01-29 18:39 ikits
-
- * config/version: changed versioning to make it easier to follow
-
-2005-01-29 11:59 ikits
-
- * auto/src/glew_head.h: fix borland compilation problem
-
-2005-01-28 23:36 ikits
-
- * auto/bin/parse_spec.pl: fixed GLhalf bug
-
-2005-01-21 09:04 ikits
-
- * auto/core/GL_EXT_framebuffer_object: ubercomplete
-
-2005-01-20 19:53 ikits
-
- * auto/core/GL_VERSION_2_0: fixed bugs
-
-2005-01-11 18:03 mem
-
- * auto/lib/OpenGL/Spec.pm: Clean up a little
-
-2005-01-11 15:40 mem
-
- * auto/lib/OpenGL/Spec.pm: Modularized parser
-
-2005-01-06 01:53 ikits
-
- * doc/: advanced.html, basic.html, credits.html, index.html,
- install.html, log.html, ogl_sm.jpg, new.png: sync up webpage and
- docs
-
-2005-01-06 01:26 ikits
-
- * TODO.txt: one more item
-
-2005-01-06 01:25 ikits
-
- * auto/bin/update_ext.sh: fixed GLhandleARB
-
-2005-01-05 15:37 mem
-
- * config/version: Forgot to bump GLEW version
-
-2005-01-05 15:35 mem
-
- * TODO.txt: Expanded TODO item about autoinitialization
-
-2005-01-05 15:27 mem
-
- * ChangeLog: Added ChangeLog. The file is generated with cvs2cl.
-
-2005-01-05 15:19 mem
-
- * Makefile, auto/Makefile, config/Makefile.darwin,
- config/Makefile.freebsd, config/Makefile.irix,
- config/Makefile.linux, config/Makefile.solaris, config/version:
- Fix soname, ABI broke
-
-2005-01-04 20:55 ikits
-
- * doc/gpl.txt: documentation update
-
-2005-01-04 20:32 ikits
-
- * doc/index.html: documentation update
-
-2005-01-04 20:17 ikits
-
- * doc/glew.css: documentation update
-
-2005-01-04 20:10 ikits
-
- * auto/src/template.html, doc/README.html, doc/advanced.html,
- doc/basic.html, doc/credits.html, doc/index.html,
- doc/install.html, doc/log.html: documentation update
-
-2005-01-04 20:01 ikits
-
- * README.txt, auto/src/template.html, doc/glew.css: documentation
- update
-
-2005-01-04 10:02 ikits
-
- * auto/src/glew_head.c: bug fixes
-
-2005-01-04 01:00 ikits
-
- * auto/src/template.html: web crap
-
-2005-01-04 00:30 ikits
-
- * auto/: bin/make_str.pl, src/glew_head.c, src/glew_str_glx.c,
- src/glew_str_head.c, src/glew_str_tail.c, src/glew_str_wgl.c,
- src/glew_utils.c, src/glew_utils.h: extended glewIsSupported
-
-2005-01-03 23:17 ikits
-
- * config/: Makefile.solaris, Makefile.sunos: makefile fixes
-
-2005-01-03 23:11 ikits
-
- * Makefile, config/Makefile.cygwin, config/Makefile.mingw32:
- makefile fixes
-
-2005-01-03 22:57 ikits
-
- * Makefile, config/Makefile.darwin: added darwin makefile
-
-2005-01-03 22:29 ikits
-
- * auto/: Makefile, bin/make_info.pl, bin/make_list.pl,
- bin/make_str.pl: bug fixes
-
-2005-01-03 22:05 ikits
-
- * auto/: Makefile, bin/make_init.pl, src/glew_head.c,
- src/glew_utils.c, src/glew_utils.h: bug fixes
-
-2005-01-03 02:32 ikits
-
- * Makefile, TODO.txt, auto/Makefile,
- auto/bin/fix_OML_sync_control.sh, auto/bin/make.pl,
- auto/bin/make_def_fun.pl, auto/bin/make_def_var.pl,
- auto/bin/make_header.pl, auto/bin/make_html.pl,
- auto/bin/make_info.pl, auto/bin/make_info_list.pl,
- auto/bin/make_init.pl, auto/bin/make_list.pl,
- auto/bin/make_str.pl, auto/bin/make_struct_fun.pl,
- auto/bin/make_struct_var.pl, auto/bin/parse_spec.pl,
- auto/bin/update_ext.sh, auto/bin/update_registry.sh,
- auto/src/glew_head.html, auto/src/glew_tail.html,
- auto/src/glxew_head.html, auto/src/wglew_head.html,
- auto/src/wglew_tail.html, src/visualinfo.c: Year bump in
- copyright message. Removed obsolete files from auto/src.
-
-2005-01-03 02:09 ikits
-
- * build/vc6/: glew_shared.dsp, glew_static.dsp: Single file now
- compiles with VC71. Kept multi-file split for future use.
-
-2005-01-03 02:05 ikits
-
- * auto/Makefile, auto/bin/make_header.pl, auto/bin/make_html.pl,
- auto/src/glew_gl_fun.c, auto/src/glew_gl_head.c,
- auto/src/glew_gl_init.c, auto/src/glew_gl_tail.c,
- auto/src/glew_gl_var.c, auto/src/glew_glx_fun.c,
- auto/src/glew_glx_head.c, auto/src/glew_glx_init.c,
- auto/src/glew_glx_tail.c, auto/src/glew_glx_var.c,
- auto/src/glew_head.c, auto/src/glew_head.h,
- auto/src/glew_init_gl.c, auto/src/glew_init_glx.c,
- auto/src/glew_init_tail.c, auto/src/glew_init_wgl.c,
- auto/src/glew_license.h, auto/src/glew_str_head.c,
- auto/src/glew_utils.c, auto/src/glew_utils.h,
- auto/src/glew_wgl_head.c, auto/src/glew_wgl_init.c,
- auto/src/glew_wgl_tail.c, auto/src/glew_wgl_var.c,
- auto/src/glewinfo_head.c, auto/src/glx_license.h,
- auto/src/glxew_head.h, auto/src/sgi_license.h,
- auto/src/template.html, auto/src/wglew_head.h,
- build/vc6/glew_shared.dsp, build/vc6/glew_static.dsp,
- src/glew_utils.c, src/glew_utils.h: Single file now compiles with
- VC71. Kept multi-file split for future use.
-
-2004-12-31 03:49 ikits
-
- * auto/Makefile, auto/bin/make_def_fun.pl,
- auto/bin/make_def_var.pl, auto/bin/make_header.pl,
- auto/bin/make_html.pl, auto/bin/make_info.pl,
- auto/bin/make_info_list.pl, auto/bin/make_init.pl,
- auto/bin/make_list.pl, auto/bin/make_str.pl,
- auto/bin/make_struct_fun.pl, auto/bin/make_struct_var.pl,
- auto/custom.txt, TODO.txt: added customized subset selection
-
-2004-12-29 22:11 ikits
-
- * auto/src/glew_tail.h: added longer alias
-
-2004-12-29 22:05 ikits
-
- * auto/core/GL_VERSION_2_0: bug fixes
-
-2004-12-29 21:59 ikits
-
- * auto/core/GL_VERSION_2_0: added core 2.0 spec file
-
-2004-12-29 02:45 ikits
-
- * auto/core/WGL_ATI_render_texture_rectangle: the drivers seem to
- support it; no public spec yet, though
-
-2004-12-29 02:22 ikits
-
- * auto/Makefile, auto/src/glew_gl_head.c, auto/src/glew_gl_tail.c,
- auto/src/glew_glx_head.c, auto/src/glew_glx_init.c,
- auto/src/glew_glx_tail.c, auto/src/glew_str_glx.c,
- auto/src/glew_str_tail.c, auto/src/glew_str_wgl.c,
- auto/src/glxew_tail.h, auto/src/wglew_tail.h, build/vc6/Makefile,
- build/vc6/glew_shared.dsp, build/vc6/glew_static.dsp,
- auto/bin/make_def.pl, auto/bin/make_def_fun.pl,
- auto/bin/make_def_var.pl, auto/src/glew_gl_fun.c,
- auto/src/glew_gl_var.c, auto/src/glew_glx_fun.c,
- auto/src/glew_glx_var.c, auto/src/glew_wgl_var.c: fixed problems
- with mx builds; update project files
-
-2004-12-29 00:42 ikits
-
- * Makefile, auto/Makefile, auto/bin/make_info.pl,
- auto/bin/make_init.pl, auto/bin/make_list.pl, auto/src/glew_gl.c,
- auto/src/glew_gl_head.c, auto/src/glew_gl_init.c,
- auto/src/glew_gl_tail.c, auto/src/glew_glx.c,
- auto/src/glew_glx_head.c, auto/src/glew_glx_init.c,
- auto/src/glew_glx_tail.c, auto/src/glew_head.h,
- auto/src/glew_head.html, auto/src/glew_init_glx.c,
- auto/src/glew_post.c, auto/src/glew_post.h,
- auto/src/glew_post.html, auto/src/glew_pre.c,
- auto/src/glew_pre.h, auto/src/glew_pre.html,
- auto/src/glew_str_glx.c, auto/src/glew_str_head.c,
- auto/src/glew_str_tail.c, auto/src/glew_str_wgl.c,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list