Changeset 8377:d9717dc46a8a

Timestamp:

11/18/07 13:27:02 (6 years ago)

Author:

jvoight@…

Branch:

default

Parents:

8376:fe09ee4c519e (diff), 7660:62b7be191970 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Applied Yi's latest patch.

Files:

• sage/dsage/scripts/dsage_get_stats.py (deleted)
• setup.py (modified) (1 diff)
• setup.py (modified) (1 diff)

setup.py

@@ -756 +756 @@
     Extension('sage.rings.number_field.number_field_base',
               sources = ['sage/rings/number_field/number_field_base.pyx']), \
+
+    Extension('sage.rings.number_field.totallyreal_data',
+              ['sage/rings/number_field/totallyreal_data.pyx'],
+              libraries = ['gmp']),
 
     Extension('sage.rings.morphism',

setup.py

@@ -1195 +1195 @@
                      'sage/dsage/web/static/jquery-latest.js',
                      'sage/dsage/web/static/jquery.tablesorter.pack.js',
+                     'sage/dsage/web/static/jquery.history.js',
                      'sage/dsage/web/static/asc.gif',
                      'sage/dsage/web/static/desc.gif',
-                     'sage/dsage/web/static/bg.gif']),
+                     'sage/dsage/web/static/bg.gif',
+                     'sage/dsage/README.html']),
                     ('dsage/web/',
                     ['sage/dsage/web/index.html'])],