diff options
| author | John R. Lenton | 2014-01-04 01:28:40 +0000 |
|---|---|---|
| committer | John R. Lenton | 2014-01-04 01:28:40 +0000 |
| commit | a58cf679ee466b0bcd873603515a3ef293252b20 (patch) | |
| tree | 5c8f539733f248b7f601ed29b439fb25295a26d7 /stm | |
| parent | e241e8c1698e5299deb10b718ffa30e2cca39301 (diff) | |
| parent | c8d1384fc0c7aafa5dee3445ece20f4e43dfa9c1 (diff) | |
Merge remote-tracking branch 'upstream/master' into list_count
Diffstat (limited to 'stm')
| -rw-r--r-- | stm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/stm/Makefile b/stm/Makefile index d6c77e2bd..e84e21eae 100644 --- a/stm/Makefile +++ b/stm/Makefile @@ -78,6 +78,7 @@ PY_O = \ objnone.o \ objrange.o \ objset.o \ + objslice.o \ objstr.o \ objtuple.o \ objtype.o \ |