commit 12731e8869b7ab1d1528d6122fa72b12dded83c2 Merge: 9db041e 8612e5d Author: aagbsn <aagbsn@extc.org> Date: Wed Nov 13 09:54:57 2013 -0800 Merge pull request #240 from TheTorProject/feature/include-decks-n-inputs Feature/include decks n inputs MANIFEST.in | 2 ++ data/decks/basic.deck | 24 ++++++++++++++ data/decks/before_i_commit.testdeck | 36 +++++++++++++++++++++ data/decks/short_no_root.deck | 60 +++++++++++++++++++++++++++++++++++ data/inputs/Makefile | 13 ++++++++ data/inputs/README | 47 +++++++++++++++++++++++++++ decks/basic.deck | 24 -------------- decks/before_i_commit.testdeck | 36 --------------------- decks/short_no_root.deck | 60 ----------------------------------- inputs/Makefile | 13 -------- inputs/README | 47 --------------------------- 11 files changed, 182 insertions(+), 180 deletions(-)