Merge pull request #10 from qqldd/dev

Booksim2 abandoned svn and moved to github (https://github.com/booksim/b...

1 files changed, 0 insertions, 27 deletions

diff --git a/README b/README
index 7ec45ea..4883e93 100644
--- a/README
+++ b/README
@@ -339,30 +339,3 @@ the applications you care about (implying these applications worked for you
 before you did the merge). You want to do this before making further changes to
 identify any compile time or runtime errors that occur due to the code merging
 process. 
-
-3.2 (OPTIONAL) Updating Intersim2 (ADVANCED USERS ONLY)
-
-Booksim 2.0 is maintained by the Concurrent VLSI Architecture group at Stanford
-(https://nocs.stanford.edu/cgi-bin/trac.cgi/wiki/Resources/BookSim). Intersim2 
-is Booksim 2.0 with extentions. Booksim 2.0 is still under active development, 
-with updates that usually bring cutting edge features and bug fixes. If you want
-these new features or bug fixes, it is possible to pull updates from Booksim 2.0
- server and apply the updates to Intersim2. You can follow the instructions 
-below to update Intersim2 with the new Booksim 2.0.
-
-As above, YOU SHOULD BACKUP YOUR CHANGES BEFORE PROCEEDING.
-
-The Booksim 2.0 uses svn source control. First, go to the Intersim2 root 
-directory($GPGPUSIM_ROOT/src/intersim2) in the terminal. Then, run the 
-following command in terminal:
-
-svn update
-
-While svn is updating your local copy of Intersim2 with the latest changes from
-the Booksim 2.0 svn server, conflicts might arise due to changes that either we
-or you made that conflict with the latest updates. In this case, svn will prompt
-you to edit conflict files using default text editor or you can postpone it and 
-then using your favorite merge tool to resolve conflict files.
-
-After you updated Intersim2, you should test the merged version through the 
-instructions described in Section 3.1.