Merge in branch 'genmatmult' (trac #19751)

sagemath · Dec 20, 2015 · e0a8669 · e0a8669
2 parents 0e3c4ce + 308ed3d
commit e0a8669
Show file tree

Hide file tree

Showing 326 changed files with 8,838 additions and 4,203 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-Sage version 6.10.beta6, released 2015-11-27
+Sage version 6.10, released 2015-12-18
diff --git a/build/make/deps b/build/make/deps
@@ -188,7 +188,8 @@ $(SAGE_EXTCODE)/%: $(SAGE_SRC)/ext/%
 DOC_DEPENDENCIES = sagelib $(INST)/$(SPHINX) $(INST)/$(SAGENB) \
 	| $(SAGERUNTIME) $(INST)/$(MAXIMA) $(INST)/$(NETWORKX) \
 	$(INST)/$(SCIPY) $(INST)/$(MATPLOTLIB) $(INST)/$(PILLOW) \
-	$(INST)/$(MATHJAX) $(INST)/$(IPYKERNEL) $(INST)/$(JUPYTER_CLIENT)
+	$(INST)/$(MATHJAX) $(INST)/$(IPYKERNEL) $(INST)/$(JUPYTER_CLIENT) \
+	$(INST)/$(CONWAY_POLYNOMIALS)
 
 doc: doc-html
 

diff --git a/build/pkgs/arb/checksums.ini b/build/pkgs/arb/checksums.ini
@@ -1,4 +1,4 @@
-tarball=arb-VERSION.tar.gz
-sha1=e8c367b9f617262b4a7e9956cf49b6acf5c0db24
-md5=683f4b9f975f8e546ca4481f803cd099
-cksum=444089473
+tarball=arb-VERSION.tar.bz2
+sha1=fe1d6381d80498c40178c2a55fe93e0bface7c76
+md5=d97b2cbad8afc8ff05785840ed473ef3
+cksum=2593037017
diff --git a/build/pkgs/arb/package-version.txt b/build/pkgs/arb/package-version.txt
@@ -1,2 +1 @@
-2.6.0
-
+2.7.0.p0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Sage version 6.10.beta6, released 2015-11-27
		Sage version 6.10, released 2015-12-18