summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Corrected doc and error message if igraph is not installedu/borassi/include_igraph_libraryMichele Borassi2015-08-071-4/+9
* Corrected merge errorMichele Borassi2015-08-072-6/+0
* Merged with beta1Michele Borassi2015-08-0674-1112/+6529
|\
| * Updated Sage version to 6.9.beta16.9.beta1Volker Braun2015-08-066-10/+10
| * Trac #18993: sage-list-packages should ignore files in build/pkgs/Release Manager2015-08-051-0/+2
| |\
| | * Ignore files in spkg directoryu/jkeitel/sage-list-packagesJan Keitel2015-08-051-0/+2
| * | Trac #18991: Remove useful doctestRelease Manager2015-08-051-1/+1
| |\ \
| | * | trac #18991: Remove useful doctestu/ncohen/18991Nathann Cohen2015-08-051-1/+1
| * | | Trac #18988: Orthogonal Polar graphs in strongly_regular_graphRelease Manager2015-08-051-2/+79
| |\ \ \ | | |/ /
| | * | trac #18988: Merged with updated #18960u/ncohen/18988Nathann Cohen2015-08-051-2/+79
| | |\ \
| | | * | trac #18988: Orthogonal Polar graphs in strongly_regular_graphNathann Cohen2015-08-041-2/+79
| * | | | Trac #18960: Strongly Regular Graphs from two-weight codesRelease Manager2015-08-051-1/+534
| |\ \ \ \ | | |/ / /
| | * | | trac #18960: Merged with updated #18948u/ncohen/18960Nathann Cohen2015-08-051-1/+534
| | |\ \ \ | | | |/ /
| | | * | trac #18960: Merge with updated #18948Nathann Cohen2015-08-031-1/+534
| | | |\ \
| | | | * | trac #18960: Lint -> vLintNathann Cohen2015-08-031-2/+2
| | | | * | trac #18960: Again...Nathann Cohen2015-07-311-5/+11
| | | | * | trac #18960: Adding nonzero somewhereNathann Cohen2015-07-301-5/+5
| | | | * | trac #18960: Merge 6.9.beta0Nathann Cohen2015-07-308-6/+1190
| | | | |\ \
| | | | | * | trac #18960: Strongly Regular Graphs from two-weight codesNathann Cohen2015-07-281-1/+528