projects
/
blender-staging.git
/ history
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
svn merge -r 22571:22800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git]
/
extern
/
SConscript
2009-09-15
Andre Susano Pinto
svn merge -r 22571:22800 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
2009-09-12
Martin Poirier
copying 2.5 over to trunk
blob
|
commitdiff
|
raw
|
diff to current
2009-09-11
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-08
Dalai Felinto
manual merge trunk -r 23037
blob
|
commitdiff
|
raw
|
diff to current
2009-09-07
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-07
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-01
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
blob
|
commitdiff
|
raw
|
diff to current
2009-08-29
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
blob
|
commitdiff
|
raw
|
diff to current
2009-08-24
Nathan Letwory
* merge r22734 from trunk
blob
|
commitdiff
|
raw
|
diff to current
2009-08-23
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
blob
|
commitdiff
|
raw
|
diff to current
2009-08-23
Matt Ebb
svn merge -r 22628:22714 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2009-08-22
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
blob
|
commitdiff
|
raw
|
diff to current
2009-08-22
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
blob
|
commitdiff
|
raw
|
diff to current
2009-08-21
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
blob
|
commitdiff
|
raw
|
diff to current
2009-08-20
Daniel Genrich
Smoke:
blob
|
commitdiff
|
raw
|
diff to current
2009-08-15
Joshua Leung
Commenting out code from commit 22457 by Genscher for...
blob
|
commitdiff
|
raw
2009-08-13
Matt Ebb
* First commit merging 2.4-based sim_physics in to...
blob
|
commitdiff
|
raw
2009-08-07
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
blob
|
commitdiff
|
raw
2009-08-04
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
blob
|
commitdiff
|
raw
2009-08-02
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
blob
|
commitdiff
|
raw
2009-07-31
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
blob
|
commitdiff
|
raw
2009-07-31
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
blob
|
commitdiff
|
raw
2009-07-25
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
blob
|
commitdiff
|
raw
2009-07-25
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
blob
|
commitdiff
|
raw
2009-07-02
Andre Susano Pinto
svn merge -r 21041:21301 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
2009-07-02
Andre Susano Pinto
Reverted incorrect merge (missing files)
blob
|
commitdiff
|
raw
|
diff to current
2009-06-29
Andre Susano Pinto
svn merge -r 21041:21243 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
2009-06-22
Campbell Barton
removing files that should not be in blender2.5, added...
blob
|
commitdiff
|
raw
2009-06-22
Joshua Leung
NLA SoC: Merge from 2.5
blob
|
commitdiff
|
raw
2009-06-21
Campbell Barton
Spring Cleaning
blob
|
commitdiff
|
raw
2009-06-16
Campbell Barton
small merge needed for testing new animsys in 2.5 BGE...
blob
|
commitdiff
|
raw
|
diff to current
2009-06-16
Campbell Barton
changes to the sequencer in trunk between 20855:20928...
blob
|
commitdiff
|
raw
|
diff to current
2009-06-16
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Campbell Barton
svn merge https://svn.blender.org/svnroot/bf-blender...
blob
|
commitdiff
|
raw
|
diff to current
2009-06-13
Campbell Barton
merged from trunk 20741:20848
blob
|
commitdiff
|
raw
|
diff to current
2009-06-08
Brecht Van Lommel
2.50:
blob
|
commitdiff
|
raw
|
diff to current
2009-05-10
Andre Susano Pinto
svn merge -r 20018:20133 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2009-05-09
Joshua Leung
NLA-SoC: Merge from 2.5 branch 19863:20113
blob
|
commitdiff
|
raw
|
diff to current
2009-05-08
Kent Mein
Tweaks to build systems. Just some small cleanups...
blob
|
commitdiff
|
raw
|
diff to current
2009-04-20
Brecht Van Lommel
2.50: svn merge https://svn.blender.org/svnroot/bf...
blob
|
commitdiff
|
raw
|
diff to current
2009-04-20
Daniel Genrich
Hopefully a working merge with trunk (could be one...
blob
|
commitdiff
|
raw
|
diff to current
2009-03-17
Brecht Van Lommel
2.50: svn merge https://svn.blender.org/svnroot/bf...
blob
|
commitdiff
|
raw
|
diff to current
2009-03-13
Martin Poirier
merging trunk 19093:19274
blob
|
commitdiff
|
raw
|
diff to current
2009-02-25
Campbell Barton
Building the game engine with Solid/Sumo is now optiona...
blob
|
commitdiff
|
raw
|
diff to current
2009-01-26
Brecht Van Lommel
2.50: svn merge https://svn.blender.org/svnroot/bf...
blob
|
commitdiff
|
raw
|
diff to current
2009-01-04
Nathan Letwory
2.5 / Cleanup
blob
|
commitdiff
|
raw
|
diff to current
2008-11-12
Brecht Van Lommel
Merge of trunk into blender 2.5:
blob
|
commitdiff
|
raw
|
diff to current
2008-10-12
Daniel Genrich
svn merge -r 16866:17042 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-02
Martin Poirier
merge trunk 16118 -> 116886
blob
|
commitdiff
|
raw
|
diff to current
2008-10-01
Daniel Genrich
Disable building of fftw
blob
|
commitdiff
|
raw
|
diff to current
2008-10-01
Daniel Genrich
svn merge -r 16741:16866 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-09-28
Daniel Genrich
Commiting fftw lib into extern for ocean patch
blob
|
commitdiff
|
raw
|
diff to current
2008-08-01
Ian Thompson
Merged 15771:15912 from trunk
blob
|
commitdiff
|
raw
|
diff to current
2008-07-23
Maxime Curioni
soc-2008-mxcurioni: merged changes to revision 15705
blob
|
commitdiff
|
raw
|
diff to current
2008-07-18
Ian Thompson
Merged 15170:15635 from trunk (no conflicts or even...
blob
|
commitdiff
|
raw
|
diff to current
2008-07-06
Maxime Curioni
soc-2008-mxcurioni: merge-repair with trunk rev 15456
blob
|
commitdiff
|
raw
|
diff to current
2008-07-05
Maxime Curioni
soc-2008-mxcurioni: merged changes to revision 15441
blob
|
commitdiff
|
raw
|
diff to current
2008-07-02
Daniel Genrich
svn merge -r 14676:15409 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-06-23
Martin Poirier
MERGING TRUNK
blob
|
commitdiff
|
raw
|
diff to current
2008-06-20
Andre Susano Pinto
svn merge -r 15202:15292 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-06-17
Brecht Van Lommel
Merge ... apricot branch game engine changes into trunk...
blob
|
commitdiff
|
raw
|
diff to current
2008-06-09
Ian Thompson
Merged from trunk
blob
|
commitdiff
|
raw
|
diff to current
2008-06-08
Maxime Curioni
soc-2008-mxcurioni: merged changes to revision 15163
blob
|
commitdiff
|
raw
|
diff to current
2008-06-03
Andre Susano Pinto
Merge from trunk
blob
|
commitdiff
|
raw
|
diff to current
2008-06-03
Daniel Genrich
Collisions: Commit of collision cleanup, put kdop-bvh...
blob
|
commitdiff
|
raw
|
diff to current
2008-06-02
Peter Schlaile
== RED one (redcode) ==
blob
|
commitdiff
|
raw
|
diff to current
2008-05-25
Maxime Curioni
soc-2008-mxcurioni: merged changes to revision 14967
blob
|
commitdiff
|
raw
|
diff to current
2008-05-11
Maxime Curioni
soc-2008-mxcurioni: merged changes to revision 14798...
blob
|
commitdiff
|
raw
|
diff to current
2008-05-08
Maxime Curioni
soc-2008-mxcurioni: merged changes to revision 14747...
blob
|
commitdiff
|
raw
|
diff to current
2008-05-07
Daniel Genrich
svn merge -r 13452:14721 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-05-06
Maxime Curioni
soc-2008-mxcurioni: swig compiles as independent library
blob
|
commitdiff
|
raw
|
diff to current
2008-05-05
Maxime Curioni
soc-2008-mxcurioni: lib3ds compiles as an external...
blob
|
commitdiff
|
raw
|
diff to current
2008-04-21
Daniel Genrich
svn merge -r 14236:14505 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-04-20
Peter Schlaile
== FFMPEG / mp3lame ==
blob
|
commitdiff
|
raw
|
diff to current
2008-04-13
Peter Schlaile
== FFMPEG ==
blob
|
commitdiff
|
raw
|
diff to current
2008-04-13
Peter Schlaile
== FFMPEG ==
blob
|
commitdiff
|
raw
|
diff to current
2008-03-13
Jean-Luc Peurière
resolved conflict state with HEAD r14096
blob
|
commitdiff
|
raw
|
diff to current
2008-02-04
Hamed Zaghaghi
merging game_engine branch changes into trunk, 2d-filte...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-29
Daniel Genrich
Initial commit of cloth modifier from branch rev 13453
blob
|
commitdiff
|
raw
|
diff to current
2008-01-29
Daniel Genrich
svn merge -r 13415:13452 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-26
Daniel Genrich
svn merge -r 13382:13415 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-24
Daniel Genrich
svn merge -r 13357:13382 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-22
Daniel Genrich
svn merge -r 13323:13357 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-21
Daniel Genrich
svn merge -r 13240:13323 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-18
Campbell Barton
Linux only addition to know for sure the path of blende...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-15
Daniel Genrich
svn merge -r 13177:13240 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-09
Daniel Genrich
svn merge -r 13148:13177 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-08
Nathan Letwory
* tweak linking priorities - should help for GCC users
blob
|
commitdiff
|
raw
|
diff to current
2008-01-07
Daniel Genrich
svn merge -r 13095:13148 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-02
Daniel Genrich
svn merge -r 12937:13095 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-12-18
Daniel Genrich
svn merge -r 12856:12937 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-12-12
Daniel Genrich
svn merge -r 12716:12856 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-11-29
Daniel Genrich
svn merge -r 12691:12716 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-11-27
Daniel Genrich
svn merge -r 12684:12691 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-11-26
Daniel Genrich
Particle merge: svn merge -r 12653:12664 https://svn...
blob
|
commitdiff
|
raw
|
diff to current
2007-11-26
Brecht Van Lommel
Particles
blob
|
commitdiff
|
raw
|
diff to current
2007-11-24
Daniel Genrich
svn merge -r 12653:12664 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-11-22
Daniel Genrich
svn merge -r 12607:12653 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-11-16
Daniel Genrich
svn merge -r 12496:12607 https://svn.blender.org/svnroo...
blob
|
commitdiff
|
raw
|
diff to current
2007-11-06
Martin Poirier
Filling in branch from trunk
blob
|
commitdiff
|
raw
|
diff to current
next