summaryrefslogtreecommitdiff
path: root/spec.txt
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-10-26 00:03:37 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2014-10-26 00:10:27 -0700
commitb964cd14c1574388e805c2b173d21ba5c43cbe42 (patch)
tree7e0c775f271cb15c643b8b6006cd86ad6c2607b7 /spec.txt
parent16794168a936feb7f25b3fdbdddf6c24b14a779a (diff)
parenta4cfaa7aacaebd2c03a4e091f3ff1687d8f223e2 (diff)
Merge branch 'master' of https://github.com/till-varoquaux/stmd into till-varoquaux-master
Conflicts: Makefile
Diffstat (limited to 'spec.txt')
0 files changed, 0 insertions, 0 deletions