summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Borassi <michele.borassi@imtlucca.it>2015-08-06 11:47:49 +0200
committerMichele Borassi <michele.borassi@imtlucca.it>2015-08-06 11:47:49 +0200
commit93dee5e3d8e20b2fd19da57644f0f67e645171de (patch)
tree6dc3e4afbe472697de0e007a9f31927c57fb1a04
parentSimplified handling of labels (diff)
parentUpdated Sage version to 6.9.beta1 (diff)
Merged with beta1
Conflicts: src/sage/graphs/digraph.py src/sage/graphs/generic_graph.py src/sage/graphs/graph.py
-rw-r--r--VERSION.txt2
-rw-r--r--build/pkgs/configure/checksums.ini6
-rw-r--r--build/pkgs/configure/package-version.txt2
-rw-r--r--build/pkgs/ecl/SPKG.txt2
-rw-r--r--build/pkgs/ecl/checksums.ini6
-rw-r--r--build/pkgs/ecl/package-version.txt2
-rw-r--r--build/pkgs/ecl/patches/gmp.patch34