|  Melanie | 7dad1ded2e | Merge branch 'master' into careminster Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 2012-03-29 00:27:35 +01:00 | 
				
					
						|  Robert Adams | 4138880464 | BulletSim: update 64 bit libraries and change Linux configuration to use the files in the lib32 and lib64 directories as needed. | 2012-03-28 15:36:20 -07:00 | 
				
					
						|  Melanie | c521f3b348 | Fix UbitODE dll mappping by simply copying the one from ODE.Net | 2012-03-09 02:39:02 +01:00 | 
				
					
						|  UbitUmarov | 754129b903 | files need to run UbitODE in linux ( untested ) | 2012-02-08 15:33:51 +00:00 | 
				
					
						|  Justin Clark-Casey (justincc) | 6f69ab3bcb | Add back BulletSPlugin.dll.config that I somehow managed to delete today in a00327d | 2011-09-17 00:49:26 +01:00 | 
				
					
						|  justincc | a00327d0e5 | Fix build errors on Windows by adding missing OpenSim.Services.Base reference | 2011-09-16 19:54:23 +01:00 | 
				
					
						|  Snoopy Pfeffer | 9f75eaf50e | Fixed BulletSim config files for Linux *.so libraries. | 2011-09-04 21:42:33 +02:00 | 
				
					
						|  Robert Adams | b281163457 | BulletSim: add .so for 64 bit Linux. Move .config file to where it will be read. | 2011-08-30 13:19:53 -07:00 | 
				
					
						|  Dahlia Trimble | 07ee2c3504 | Revert r7548 and r7549 until someone with prebuild-fu can help structure the dependencies | 2008-11-30 03:52:18 +00:00 | 
				
					
						|  Dahlia Trimble | 37afd69feb | Removed remaining meshing code Add PrimMesher.dll r21
All meshing tasks are now passed through Meshmerizer and handled by PrimMesher.dll | 2008-11-30 03:13:02 +00:00 |