Skip to content

Commit

Permalink
Merge trunk r44709 to STABLE
Browse files Browse the repository at this point in the history 
svn:revision:44710
svn:branch:STABLE
svn:account:starseeker
  • Loading branch information
@starseeker
starseeker committed May 27, 2011
2 parents 9d18491 + 67f2c6d commit 3a379ce
Show file tree
Hide file tree
Showing 332 changed files with 46,302 additions and 8,512 deletions.
35 changes: 2 additions & 33 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,3 @@
/.deps
/Makefile
/Makefile.in
/aclocal.m4
/autom4te.cache
/config.*
/configure
/install.*.log
/libtool
/ltmain.sh
/so_locations
/.settings
/.project
/.cdtproject
/.cproject
/.externalToolBuilders
/Makefile
/Makefile.in
/build_pattern
/build_region
/ebm_primitive
/mgedrc
/nirt
/oed
/pipes
/projection_shader
/tire
/Makefile
/Makefile.in
/tutorial_series
/Makefile
/Makefile.in
/mged



1,596 changes: 1,596 additions & 0 deletions CMakeLists.txt
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 3a379ce

Please sign in to comment.