Merge branch 'ticket/15714' into develop

sagemath · Feb 25, 2014 · e7958b0 · e7958b0
2 parents 6452f9d + f73e11e
commit e7958b0
Show file tree

Hide file tree

Showing 3 changed files with 442 additions and 0 deletions.
diff --git a/src/doc/en/reference/combinat/index.rst b/src/doc/en/reference/combinat/index.rst
@@ -11,6 +11,7 @@ Combinatorics
    sage/combinat/expnums
    sage/combinat/alternating_sign_matrix
    sage/combinat/cartesian_product
+   sage/combinat/cfinite_sequence
    sage/combinat/combination
    sage/combinat/composition_signed
    sage/combinat/composition

diff --git a/src/sage/combinat/all.py b/src/sage/combinat/all.py
@@ -118,6 +118,7 @@
 from necklace import Necklaces
 from lyndon_word import LyndonWord, LyndonWords, StandardBracketedLyndonWords
 from dyck_word import DyckWords, DyckWord
+from cfinite_sequence import CFiniteSequence
 from sloane_functions import sloane
 
 from root_system.all import *