From c1ddbe06867ec5f8f91b6ee285a1955a6c5a4749 Mon Sep 17 00:00:00 2001
From: erwincoumans <erwin.coumans@gmail.com>
Date: Fri, 10 Jan 2014 16:54:38 -0800
Subject: [PATCH] Update readme.txt

note about merging Bullet 2.x into Bullet 3.
---
 readme.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/readme.txt b/readme.txt
index 1e0073fab..3bf4e2478 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,6 @@
 Bullet 3.x GPU rigid body pipeline using OpenCL.
+Note that the Bullet 2.x svn repository from http://bullet.googlecode.com
+is being merged into this repository. This merging is work-in-progress.
 
 The entire collision detection and rigid body dynamics is executed on the GPU.