[pypy-commit] extradoc extradoc: merge heads

Author: Antonio Cuni Branch: extradoc Changeset: r5969:f70d7fc3055f Date: 2019-12-17 18:49 +0100 http://bitbucket.org/pypy/extradoc/changeset/f70d7fc3055f/ Log:merge heads diff --git a/blog/draft/2019-12-hpy-sprint.rst b/blog/draft/2019-12-hpy-sprint.rst ---

[pypy-commit] extradoc extradoc: merge heads

Author: Carl Friedrich Bolz-Tereick Branch: extradoc Changeset: r5950:35ad47c08926 Date: 2019-07-09 10:58 +0200 http://bitbucket.org/pypy/extradoc/changeset/35ad47c08926/ Log:merge heads diff --git a/talk/synerise2019/talk.key b/talk/synerise2019/talk.key new file mode 100644 index

[pypy-commit] extradoc extradoc: merge matti's branch

Author: Antonio Cuni Branch: extradoc Changeset: r5910:950b881dbe7f Date: 2018-09-21 00:37 +0200 http://bitbucket.org/pypy/extradoc/changeset/950b881dbe7f/ Log:merge matti's branch diff --git a/blog/draft/2018-09-cpyext/cpyext.rst b/blog/draft/2018-09-cpyext/cpyext.rst ---

[pypy-commit] extradoc extradoc: merge matti's conclusion

Author: Antonio Cuni Branch: extradoc Changeset: r5912:01209d5a3343 Date: 2018-09-21 00:48 +0200 http://bitbucket.org/pypy/extradoc/changeset/01209d5a3343/ Log:merge matti's conclusion diff --git a/blog/draft/2018-09-cpyext/cpyext.rst b/blog/draft/2018-09-cpyext/cpyext.rst ---

[pypy-commit] extradoc extradoc: merge heads

Author: Armin Rigo Branch: extradoc Changeset: r5776:b8a362c95c2d Date: 2017-02-09 07:46 +0100 http://bitbucket.org/pypy/extradoc/changeset/b8a362c95c2d/ Log:merge heads diff --git a/sprintinfo/leysin-winter-2017/people.txt b/sprintinfo/leysin-winter-2017/people.txt ---

[pypy-commit] extradoc extradoc: merge heads

Author: Armin Rigo Branch: extradoc Changeset: r5737:3452de724eed Date: 2016-10-08 07:04 +0200 http://bitbucket.org/pypy/extradoc/changeset/3452de724eed/ Log:merge heads diff --git a/blog/draft/jit-leaner-frontend.rst b/blog/draft/jit-leaner-frontend.rst ---

[pypy-commit] extradoc extradoc: merge

Author: fijal Branch: extradoc Changeset: r5732:f2de29b2d3a6 Date: 2016-10-06 13:58 +0200 http://bitbucket.org/pypy/extradoc/changeset/f2de29b2d3a6/ Log:merge diff --git a/blog/draft/jit-leaner-frontend.rst b/blog/draft/jit-leaner-frontend.rst --- a/blog/draft/jit-leaner-frontend.rst +++

[pypy-commit] extradoc extradoc: merge

Author: fijal Branch: extradoc Changeset: r5733:a32bf715ec0c Date: 2016-10-06 13:59 +0200 http://bitbucket.org/pypy/extradoc/changeset/a32bf715ec0c/ Log:merge diff --git a/planning/py3.5/milestone-1-progress.rst b/planning/py3.5/milestone-1-progress.rst ---

[pypy-commit] extradoc extradoc: merge heads

Author: Armin Rigo Branch: extradoc Changeset: r5675:b55c45c4f64f Date: 2016-08-18 10:11 +0200 http://bitbucket.org/pypy/extradoc/changeset/b55c45c4f64f/ Log:merge heads diff --git a/planning/py3.5/2016-august-progress.rst b/planning/py3.5/2016-august-progress.rst ---

[pypy-commit] extradoc extradoc: merge heads

Author: Richard Plangger Branch: extradoc Changeset: r5659:15244739241e Date: 2016-08-01 10:46 +0200 http://bitbucket.org/pypy/extradoc/changeset/15244739241e/ Log:merge heads diff --git a/blog/draft/revdb.rst b/blog/draft/revdb.rst --- a/blog/draft/revdb.rst +++

[pypy-commit] extradoc extradoc: merge heads

Author: Armin Rigo Branch: extradoc Changeset: r5656:7e5e14327a92 Date: 2016-07-18 17:55 +0200 http://bitbucket.org/pypy/extradoc/changeset/7e5e14327a92/ Log:merge heads diff too long, truncating to 2000 out of 20970 lines diff --git

[pypy-commit] extradoc extradoc: merge

Author: fijal Branch: extradoc Changeset: r5633:435c6aa7beb4 Date: 2016-04-07 11:27 +0300 http://bitbucket.org/pypy/extradoc/changeset/435c6aa7beb4/ Log:merge diff --git a/blog/draft/jit-leaner-frontend.rst b/blog/draft/jit-leaner-frontend.rst --- a/blog/draft/jit-leaner-frontend.rst +++

[pypy-commit] extradoc extradoc: merge

Author: fijal Branch: extradoc Changeset: r5627:cf47f49e413a Date: 2016-04-03 09:43 +0100 http://bitbucket.org/pypy/extradoc/changeset/cf47f49e413a/ Log:merge diff too long, truncating to 2000 out of 2393 lines diff --git a/talk/bucharest2016/jit-backend-8vhY1ArTsh.txt

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r5540:ea1511561764 Date: 2015-07-15 12:51 +0200 http://bitbucket.org/pypy/extradoc/changeset/ea1511561764/ Log:merge diff --git a/talk/ep2015/pypy-abstract.rst b/talk/ep2015/pypy-abstract.rst new file mode 100644 ---

[pypy-commit] extradoc extradoc: merge

Author: Antonio Cuni anto.c...@gmail.com Branch: extradoc Changeset: r5532:2403b934d742 Date: 2015-04-16 17:52 +0200 http://bitbucket.org/pypy/extradoc/changeset/2403b934d742/ Log:merge diff --git a/talk/ep2015/performance-abstract.txt b/talk/ep2015/performance-abstract.txt ---

[pypy-commit] extradoc extradoc: merge heads

Author: Armin Rigo ar...@tunes.org Branch: extradoc Changeset: r5471:dde71b6447a4 Date: 2014-11-17 14:40 +0100 http://bitbucket.org/pypy/extradoc/changeset/dde71b6447a4/ Log:merge heads diff --git a/blog/draft/tornado-stm-results.png b/blog/draft/tornado-stm-results.png new file mode 100644

[pypy-commit] extradoc extradoc: merge

Author: Hakan Ardo ha...@debian.org Branch: extradoc Changeset: r5465:206c058dcb38 Date: 2014-11-21 09:50 +0100 http://bitbucket.org/pypy/extradoc/changeset/206c058dcb38/ Log:merge diff --git a/blog/draft/io-improvements.rst b/blog/draft/io-improvements.rst new file mode 100644 --- /dev/null

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r5450:63fc42f028e6 Date: 2014-10-29 15:08 +0100 http://bitbucket.org/pypy/extradoc/changeset/63fc42f028e6/ Log:merge diff --git a/sprintinfo/warsaw-2014/planning.txt b/sprintinfo/warsaw-2014/planning.txt ---

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r5442:bb1fcacdc6cb Date: 2014-10-18 15:48 +0200 http://bitbucket.org/pypy/extradoc/changeset/bb1fcacdc6cb/ Log:merge diff --git a/talk/pyconpl-2014/talk.pdf b/talk/pyconpl-2014/talk.pdf new file mode 100644 index

[pypy-commit] extradoc extradoc: Merge heads

Author: Romain Guillebert romain...@gmail.com Branch: extradoc Changeset: r5424:12b314a72e1f Date: 2014-10-05 21:00 +0200 http://bitbucket.org/pypy/extradoc/changeset/12b314a72e1f/ Log:Merge heads diff --git a/sprintinfo/warsaw-2014/announcement.txt b/sprintinfo/warsaw-2014/announcement.txt

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r5407:7adbccfa295d Date: 2014-09-19 08:33 +0200 http://bitbucket.org/pypy/extradoc/changeset/7adbccfa295d/ Log:merge diff --git a/talk/pycon-uk-2014/Makefile b/talk/pycon-uk-2014/Makefile new file mode 100644 ---

[pypy-commit] extradoc extradoc: merge heads

Author: Ronan Lamy ronan.l...@gmail.com Branch: extradoc Changeset: r5410:ef7b6443a343 Date: 2014-09-19 11:35 +0100 http://bitbucket.org/pypy/extradoc/changeset/ef7b6443a343/ Log:merge heads diff --git a/talk/brno-php-2014/talk.rst b/talk/brno-php-2014/talk.rst new file mode 100644 ---

[pypy-commit] extradoc extradoc: merge heads

Author: Armin Rigo ar...@tunes.org Branch: extradoc Changeset: r5398:347ebc4365d2 Date: 2014-09-13 18:05 +0200 http://bitbucket.org/pypy/extradoc/changeset/347ebc4365d2/ Log:merge heads diff --git a/talk/pycon2015/status/abstract.rst b/talk/pycon2015/status/abstract.rst ---

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r5388:f72b1d32ce88 Date: 2014-08-20 19:31 +0200 http://bitbucket.org/pypy/extradoc/changeset/f72b1d32ce88/ Log:merge diff --git a/talk/dls2014/paper/paper.pdf b/talk/dls2014/paper/paper.pdf index

[pypy-commit] extradoc extradoc: merge

Author: Remi Meier remi.me...@inf.ethz.ch Branch: extradoc Changeset: r5216:d7be425514e9 Date: 2014-05-02 10:43 +0200 http://bitbucket.org/pypy/extradoc/changeset/d7be425514e9/ Log:merge diff --git a/talk/icooolps2014/position-paper.tex b/talk/icooolps2014/position-paper.tex ---

[pypy-commit] extradoc extradoc: Merge

Author: Remi Meier remi.me...@inf.ethz.ch Branch: extradoc Changeset: r5203:79b1aa4130ee Date: 2014-04-29 16:55 +0200 http://bitbucket.org/pypy/extradoc/changeset/79b1aa4130ee/ Log:Merge diff --git a/talk/icooolps2014/position-paper.tex b/talk/icooolps2014/position-paper.tex ---

[pypy-commit] extradoc extradoc: merge stm-edit (thanks matti)

Author: Armin Rigo ar...@tunes.org Branch: extradoc Changeset: r5192:d39f9507bbbe Date: 2014-04-08 10:40 +0200 http://bitbucket.org/pypy/extradoc/changeset/d39f9507bbbe/ Log:merge stm-edit (thanks matti) diff --git a/planning/tmdonate2.txt b/planning/tmdonate2.txt ---

[pypy-commit] extradoc extradoc: merge upstream

Author: Philip Jenvey pjen...@underboss.org Branch: extradoc Changeset: r5151:1694aba0aca8 Date: 2014-02-07 11:35 -0800 http://bitbucket.org/pypy/extradoc/changeset/1694aba0aca8/ Log:merge upstream diff --git a/planning/jit.txt b/planning/jit.txt --- a/planning/jit.txt +++ b/planning/jit.txt

[pypy-commit] extradoc extradoc: merge heads

Author: Armin Rigo ar...@tunes.org Branch: extradoc Changeset: r5134:a158a379906c Date: 2014-01-23 16:47 +0100 http://bitbucket.org/pypy/extradoc/changeset/a158a379906c/ Log:merge heads diff --git a/sprintinfo/leysin-winter-2014/planning.txt b/sprintinfo/leysin-winter-2014/planning.txt ---

[pypy-commit] extradoc extradoc: merge

Author: Remi Meier remi.me...@gmail.com Branch: extradoc Changeset: r5085:33bd3a8dd88d Date: 2013-10-15 11:53 +0200 http://bitbucket.org/pypy/extradoc/changeset/33bd3a8dd88d/ Log:merge diff --git a/blog/draft/incremental-gc.rst b/blog/draft/incremental-gc.rst ---

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r5073:8ae7445f165e Date: 2013-10-14 17:57 +0200 http://bitbucket.org/pypy/extradoc/changeset/8ae7445f165e/ Log:merge diff --git a/blog/draft/stm-oct2013.rst b/blog/draft/stm-oct2013.rst new file mode 100644 --- /dev/null

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r5031:8d4b1136211a Date: 2013-08-27 11:50 +0100 http://bitbucket.org/pypy/extradoc/changeset/8d4b1136211a/ Log:merge diff --git a/sprintinfo/london-2013/planning.txt b/sprintinfo/london-2013/planning.txt ---

[pypy-commit] extradoc extradoc: merge

Author: Carl Friedrich Bolz cfb...@gmx.de Branch: extradoc Changeset: r5005:c6a375bcba0f Date: 2013-07-24 13:31 +0200 http://bitbucket.org/pypy/extradoc/changeset/c6a375bcba0f/ Log:merge diff --git a/sprintinfo/london-2013/planning.txt b/sprintinfo/london-2013/planning.txt ---

[pypy-commit] extradoc extradoc: merge

Author: Carl Friedrich Bolz cfb...@gmx.de Branch: extradoc Changeset: r5004:02849eb0a42a Date: 2013-07-24 11:30 +0200 http://bitbucket.org/pypy/extradoc/changeset/02849eb0a42a/ Log:merge diff --git a/sprintinfo/london-2013/planning.txt b/sprintinfo/london-2013/planning.txt new file mode

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4985:fbfe3d8fe09a Date: 2013-07-12 11:06 +0200 http://bitbucket.org/pypy/extradoc/changeset/fbfe3d8fe09a/ Log:merge diff --git a/planning/jit.txt b/planning/jit.txt --- a/planning/jit.txt +++ b/planning/jit.txt @@ -83,6

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4978:2f847bf4e26e Date: 2013-07-09 13:28 +0200 http://bitbucket.org/pypy/extradoc/changeset/2f847bf4e26e/ Log:merge diff --git a/blog/draft/pypy-alpha-arm.rst b/blog/draft/pypy-alpha-arm.rst ---

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4972:06be20da4eb9 Date: 2013-05-07 14:34 +0200 http://bitbucket.org/pypy/extradoc/changeset/06be20da4eb9/ Log:merge diff --git a/blog/draft/pypy-alpha-arm.rst b/blog/draft/pypy-alpha-arm.rst ---

[pypy-commit] extradoc extradoc: Merge changes.

Author: Simon Cross hodges...@gmail.com Branch: extradoc Changeset: r4948:11c4aa1b3954 Date: 2013-02-28 19:57 +0200 http://bitbucket.org/pypy/extradoc/changeset/11c4aa1b3954/ Log:Merge changes. diff --git a/blog/draft/10years.rst b/blog/draft/10years.rst --- a/blog/draft/10years.rst +++

[pypy-commit] extradoc extradoc: merge upstream

Author: Philip Jenvey pjen...@underboss.org Branch: extradoc Changeset: r4940:065d72cf8cdf Date: 2013-01-09 09:45 -0800 http://bitbucket.org/pypy/extradoc/changeset/065d72cf8cdf/ Log:merge upstream diff --git a/blog/draft/numpy-internship-2.rst b/blog/draft/numpy-internship-2.rst new file

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4933:ee71ba86558a Date: 2012-12-07 15:54 +0200 http://bitbucket.org/pypy/extradoc/changeset/ee71ba86558a/ Log:merge diff --git a/blog/draft/py3k-status-update-8.rst b/blog/draft/py3k-status-update-8.rst new file mode

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4920:82a0c82fdcf9 Date: 2012-11-16 15:52 +0100 http://bitbucket.org/pypy/extradoc/changeset/82a0c82fdcf9/ Log:merge diff too long, truncating to 2000 out of 21927 lines diff --git a/blog/draft/arm-status-update.rst

[pypy-commit] extradoc extradoc: merge heads

Author: David Schneider david.schnei...@picle.org Branch: extradoc Changeset: r4910:4dd05e513e27 Date: 2012-11-09 16:36 +0100 http://bitbucket.org/pypy/extradoc/changeset/4dd05e513e27/ Log:merge heads diff --git a/talk/fscons2012/GIL.fig b/talk/fscons2012/GIL.fig new file mode 100644 ---

[pypy-commit] extradoc extradoc: merge

Author: Antonio Cuni anto.c...@gmail.com Branch: extradoc Changeset: r4902:c5fc0e94acae Date: 2012-11-01 12:21 +0100 http://bitbucket.org/pypy/extradoc/changeset/c5fc0e94acae/ Log:merge diff --git a/blog/draft/numpy-status-update-5.rst b/blog/draft/numpy-status-update-5.rst ---

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4866:85b726d79ae2 Date: 2012-10-17 09:51 +0200 http://bitbucket.org/pypy/extradoc/changeset/85b726d79ae2/ Log:merge diff --git a/talk/dls2012/benchmarks/image/sobel.py b/talk/dls2012/benchmarks/image/sobel.py ---

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4868:53b9c87e31e9 Date: 2012-10-17 09:52 +0200 http://bitbucket.org/pypy/extradoc/changeset/53b9c87e31e9/ Log:merge diff too long, truncating to 2000 out of 11558 lines diff --git a/blog/draft/py3k-status-update-6.rst

[pypy-commit] extradoc extradoc: merge heads

Author: Antonio Cuni anto.c...@gmail.com Branch: extradoc Changeset: r4860:7274e147df46 Date: 2012-10-16 16:46 +0200 http://bitbucket.org/pypy/extradoc/changeset/7274e147df46/ Log:merge heads diff --git a/blog/draft/py3k-status-update-6.rst b/blog/draft/py3k-status-update-6.rst ---

[pypy-commit] extradoc extradoc: merge heads

Author: David Schneider david.schnei...@picle.org Branch: extradoc Changeset: r4852:3d51b9884b17 Date: 2012-10-12 12:27 -0300 http://bitbucket.org/pypy/extradoc/changeset/3d51b9884b17/ Log:merge heads diff --git a/talk/dls2012/presentation/talk.tex b/talk/dls2012/presentation/talk.tex new

[pypy-commit] extradoc extradoc: merge heads

Author: Armin Rigo ar...@tunes.org Branch: extradoc Changeset: r4843:0730c6ebec3f Date: 2012-10-08 17:55 +0200 http://bitbucket.org/pypy/extradoc/changeset/0730c6ebec3f/ Log:merge heads diff --git a/talk/ep2012/jit/abstract.rst b/talk/pycon-uk-2012/abstract.rst copy from

[pypy-commit] extradoc extradoc: merge

Author: Antonio Cuni anto.c...@gmail.com Branch: extradoc Changeset: r4840:2a3bbf1385ee Date: 2012-10-06 16:21 +0200 http://bitbucket.org/pypy/extradoc/changeset/2a3bbf1385ee/ Log:merge diff --git a/blog/draft/py3k-status-update-6.rst b/blog/draft/py3k-status-update-6.rst ---

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4823:3a1a4d5abe2a Date: 2012-09-23 11:38 +0200 http://bitbucket.org/pypy/extradoc/changeset/3a1a4d5abe2a/ Log:merge diff --git a/talk/confoo2013/abstract_pypy.rst b/talk/confoo2013/abstract_pypy.rst ---

[pypy-commit] extradoc extradoc: merge

Author: Hakan Ardo ha...@debian.org Branch: extradoc Changeset: r4806:05aecd80978d Date: 2012-09-13 11:18 +0200 http://bitbucket.org/pypy/extradoc/changeset/05aecd80978d/ Log:merge diff --git a/talk/googlezurich2012/Makefile b/talk/googlezurich2012/Makefile new file mode 100644 --- /dev/null

[pypy-commit] extradoc extradoc: merge heads

Author: Armin Rigo ar...@tunes.org Branch: extradoc Changeset: r4804:5791a9bad27b Date: 2012-09-13 07:33 +0200 http://bitbucket.org/pypy/extradoc/changeset/5791a9bad27b/ Log:merge heads diff --git a/blog/draft/arm-status-update.rst b/blog/draft/arm-status-update.rst new file mode 100644 ---

[pypy-commit] extradoc extradoc: merge

Author: Hakan Ardo ha...@debian.org Branch: extradoc Changeset: r4792:e5e0c9a46550 Date: 2012-09-12 07:53 +0200 http://bitbucket.org/pypy/extradoc/changeset/e5e0c9a46550/ Log:merge diff --git a/blog/draft/arm-status-update.rst b/blog/draft/arm-status-update.rst new file mode 100644 ---

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4743:0efe1254abc1 Date: 2012-09-05 19:14 +0200 http://bitbucket.org/pypy/extradoc/changeset/0efe1254abc1/ Log:merge diff --git a/sprintinfo/cape-town-2012/announce.txt b/sprintinfo/cape-town-2012/announce.txt ---

[pypy-commit] extradoc extradoc: merge heads

Author: Armin Rigo ar...@tunes.org Branch: extradoc Changeset: r4717:b63d6d57fa04 Date: 2012-08-21 18:23 +0200 http://bitbucket.org/pypy/extradoc/changeset/b63d6d57fa04/ Log:merge heads diff --git a/talk/vmil2012/tool/guard_info.py b/talk/vmil2012/tool/guard_info.py new file mode 100644 ---

[pypy-commit] extradoc extradoc: merge

Author: Hakan Ardo ha...@debian.org Branch: extradoc Changeset: r4650:29dcac6a9fca Date: 2012-08-17 10:05 +0200 http://bitbucket.org/pypy/extradoc/changeset/29dcac6a9fca/ Log:merge diff --git a/talk/stm2012/stmimpl.rst b/talk/stm2012/stmimpl.rst new file mode 100644 --- /dev/null +++

[pypy-commit] extradoc extradoc: merge

Author: Hakan Ardo ha...@debian.org Branch: extradoc Changeset: r4656:8ee1bfb6cef1 Date: 2012-08-17 11:26 +0200 http://bitbucket.org/pypy/extradoc/changeset/8ee1bfb6cef1/ Log:merge diff --git a/talk/dls2012/paper.tex b/talk/dls2012/paper.tex --- a/talk/dls2012/paper.tex +++

[pypy-commit] extradoc extradoc: merge

Author: Hakan Ardo ha...@debian.org Branch: extradoc Changeset: r4659:4eb7e0e1a59f Date: 2012-08-17 11:55 +0200 http://bitbucket.org/pypy/extradoc/changeset/4eb7e0e1a59f/ Log:merge diff --git a/talk/vmil2012/paper.tex b/talk/vmil2012/paper.tex --- a/talk/vmil2012/paper.tex +++

[pypy-commit] extradoc extradoc: merge

Author: Carl Friedrich Bolz cfb...@gmx.de Branch: extradoc Changeset: r4669:e6cb979d4a9c Date: 2012-08-17 12:27 +0200 http://bitbucket.org/pypy/extradoc/changeset/e6cb979d4a9c/ Log:merge diff --git a/talk/dls2012/paper.tex b/talk/dls2012/paper.tex --- a/talk/dls2012/paper.tex +++

[pypy-commit] extradoc extradoc: merge

Author: Carl Friedrich Bolz cfb...@gmx.de Branch: extradoc Changeset: r4684:2f682997a506 Date: 2012-08-17 15:39 +0200 http://bitbucket.org/pypy/extradoc/changeset/2f682997a506/ Log:merge diff --git a/talk/dls2012/paper.tex b/talk/dls2012/paper.tex --- a/talk/dls2012/paper.tex +++

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4623:0e39450935ed Date: 2012-08-16 15:06 + http://bitbucket.org/pypy/extradoc/changeset/0e39450935ed/ Log:merge diff --git a/talk/dls2012/licm.pdf b/talk/dls2012/licm.pdf index

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4637:890f56c12290 Date: 2012-08-16 18:33 +0200 http://bitbucket.org/pypy/extradoc/changeset/890f56c12290/ Log:merge diff --git a/talk/dls2012/paper.tex b/talk/dls2012/paper.tex --- a/talk/dls2012/paper.tex +++

[pypy-commit] extradoc extradoc: merge

Author: Hakan Ardo ha...@debian.org Branch: extradoc Changeset: r4580:168b011deac8 Date: 2012-08-15 09:43 +0200 http://bitbucket.org/pypy/extradoc/changeset/168b011deac8/ Log:merge diff --git a/talk/dls2012/paper.tex b/talk/dls2012/paper.tex --- a/talk/dls2012/paper.tex +++

[pypy-commit] extradoc extradoc: merge

Author: Hakan Ardo ha...@debian.org Branch: extradoc Changeset: r4557:492cb04d2ac5 Date: 2012-08-14 10:46 +0200 http://bitbucket.org/pypy/extradoc/changeset/492cb04d2ac5/ Log:merge diff --git a/talk/vmil2012/paper.tex b/talk/vmil2012/paper.tex --- a/talk/vmil2012/paper.tex +++

[pypy-commit] extradoc extradoc: merge

Author: Hakan Ardo ha...@debian.org Branch: extradoc Changeset: r4575:99c4fc702798 Date: 2012-08-14 20:24 +0200 http://bitbucket.org/pypy/extradoc/changeset/99c4fc702798/ Log:merge diff --git a/talk/iwtc11/benchmarks/scimark.py b/talk/iwtc11/benchmarks/scimark.py ---

[pypy-commit] extradoc extradoc: merge

Author: Hakan Ardo ha...@debian.org Branch: extradoc Changeset: r4534:00af94f610b2 Date: 2012-08-13 09:35 +0200 http://bitbucket.org/pypy/extradoc/changeset/00af94f610b2/ Log:merge diff --git a/talk/dls2012/licm.pdf b/talk/dls2012/licm.pdf index

[pypy-commit] extradoc extradoc: merge heads

Author: David Schneider david.schnei...@picle.org Branch: extradoc Changeset: r4536:a934abe0bd91 Date: 2012-08-13 10:23 +0200 http://bitbucket.org/pypy/extradoc/changeset/a934abe0bd91/ Log:merge heads diff --git a/talk/iwtc11/benchmarks/benchmark.sh b/talk/iwtc11/benchmarks/benchmark.sh ---

[pypy-commit] extradoc extradoc: merge

Author: Hakan Ardo ha...@debian.org Branch: extradoc Changeset: r4538:0f543645a0b0 Date: 2012-08-13 10:35 +0200 http://bitbucket.org/pypy/extradoc/changeset/0f543645a0b0/ Log:merge diff --git a/talk/vmil2012/paper.tex b/talk/vmil2012/paper.tex --- a/talk/vmil2012/paper.tex +++

[pypy-commit] extradoc extradoc: merge

Author: Hakan Ardo ha...@debian.org Branch: extradoc Changeset: r4521:868b3c622cee Date: 2012-08-12 09:21 +0200 http://bitbucket.org/pypy/extradoc/changeset/868b3c622cee/ Log:merge diff --git a/blog/draft/stm-jul2012.rst b/blog/draft/stm-jul2012.rst --- a/blog/draft/stm-jul2012.rst +++

[pypy-commit] extradoc extradoc: merge

Author: Hakan Ardo ha...@debian.org Branch: extradoc Changeset: r4517:6648b34c20eb Date: 2012-08-11 08:50 +0200 http://bitbucket.org/pypy/extradoc/changeset/6648b34c20eb/ Log:merge diff --git a/talk/vmil2012/figures/log.tex b/talk/vmil2012/figures/log.tex --- a/talk/vmil2012/figures/log.tex

[pypy-commit] extradoc extradoc: merge heads

Author: David Schneider david.schnei...@picle.org Branch: extradoc Changeset: r4487:72fb3711f20c Date: 2012-08-09 11:33 +0200 http://bitbucket.org/pypy/extradoc/changeset/72fb3711f20c/ Log:merge heads diff --git a/blog/draft/stm-jul2012.rst b/blog/draft/stm-jul2012.rst ---

[pypy-commit] extradoc extradoc: merge

Author: Hakan Ardo ha...@debian.org Branch: extradoc Changeset: r4484:a6fd8b7c0471 Date: 2012-08-08 21:20 +0200 http://bitbucket.org/pypy/extradoc/changeset/a6fd8b7c0471/ Log:merge diff --git a/blog/draft/stm-jul2012.rst b/blog/draft/stm-jul2012.rst --- a/blog/draft/stm-jul2012.rst +++

[pypy-commit] extradoc extradoc: merge heads

Author: David Schneider david.schnei...@picle.org Branch: extradoc Changeset: r4437:17df7ae6ed74 Date: 2012-08-07 09:28 +0200 http://bitbucket.org/pypy/extradoc/changeset/17df7ae6ed74/ Log:merge heads diff --git a/talk/dls2012/licm-submitted.pdf b/talk/dls2012/licm-submitted.pdf new file

[pypy-commit] extradoc extradoc: merge heads

Author: David Schneider david.schnei...@picle.org Branch: extradoc Changeset: r4345:5cee92065659 Date: 2012-07-24 11:20 +0200 http://bitbucket.org/pypy/extradoc/changeset/5cee92065659/ Log:merge heads diff --git a/talk/vmil2012/paper.tex b/talk/vmil2012/paper.tex ---

[pypy-commit] extradoc extradoc: merge heads

Author: David Schneider david.schnei...@picle.org Branch: extradoc Changeset: r4349:a61724c2cc46 Date: 2012-07-24 12:18 +0200 http://bitbucket.org/pypy/extradoc/changeset/a61724c2cc46/ Log:merge heads diff --git a/talk/vmil2012/paper.tex b/talk/vmil2012/paper.tex ---

[pypy-commit] extradoc extradoc: merge heads

Author: David Schneider david.schnei...@picle.org Branch: extradoc Changeset: r4355:889d9e6b1df5 Date: 2012-07-24 20:59 +0200 http://bitbucket.org/pypy/extradoc/changeset/889d9e6b1df5/ Log:merge heads diff --git a/talk/vmil2012/paper.tex b/talk/vmil2012/paper.tex ---

[pypy-commit] extradoc extradoc: merge heads

Author: David Schneider david.schnei...@picle.org Branch: extradoc Changeset: r4338:1f96dcfeae6c Date: 2012-07-23 17:01 +0200 http://bitbucket.org/pypy/extradoc/changeset/1f96dcfeae6c/ Log:merge heads diff --git a/talk/vmil2012/example/rdatasize.py b/talk/vmil2012/example/rdatasize.py ---

[pypy-commit] extradoc extradoc: merge heads

Author: David Schneider david.schnei...@picle.org Branch: extradoc Changeset: r4295:09df6e8fd4c4 Date: 2012-07-11 14:34 +0200 http://bitbucket.org/pypy/extradoc/changeset/09df6e8fd4c4/ Log:merge heads diff --git a/talk/vmil2012/paper.tex b/talk/vmil2012/paper.tex ---

[pypy-commit] extradoc extradoc: merge heads

Author: Antonio Cuni anto.c...@gmail.com Branch: extradoc Changeset: r4289:e99feb284e66 Date: 2012-07-10 11:16 +0200 http://bitbucket.org/pypy/extradoc/changeset/e99feb284e66/ Log:merge heads diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -1,3 +1,11 @@ syntax: glob

[pypy-commit] extradoc extradoc: Merge

Author: Christian Tismer tis...@stackless.com Branch: extradoc Changeset: r4275:e1c55eeebbe5 Date: 2012-07-04 12:26 +0200 http://bitbucket.org/pypy/extradoc/changeset/e1c55eeebbe5/ Log:Merge diff --git a/talk/ep2012/stm/stmdemo2.py b/talk/ep2012/stm/stmdemo2.py ---

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4279:b3b112288b65 Date: 2012-07-04 16:14 +0200 http://bitbucket.org/pypy/extradoc/changeset/b3b112288b65/ Log:merge diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -1,3 +1,11 @@ syntax: glob

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4243:06b9a3afc74a Date: 2012-07-01 10:42 +0200 http://bitbucket.org/pypy/extradoc/changeset/06b9a3afc74a/ Log:merge diff --git a/talk/ep2012/stm/Makefile b/talk/ep2012/stm/Makefile --- a/talk/ep2012/stm/Makefile +++

[pypy-commit] extradoc extradoc: merge heads

Author: Antonio Cuni anto.c...@gmail.com Branch: extradoc Changeset: r4246:e83f20f2a75e Date: 2012-07-01 13:50 +0200 http://bitbucket.org/pypy/extradoc/changeset/e83f20f2a75e/ Log:merge heads diff --git a/talk/ep2012/stm/STM-conflict.fig b/talk/ep2012/stm/STM-conflict.fig new file mode

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4195:e6c1d174b99a Date: 2012-04-17 18:51 +0200 http://bitbucket.org/pypy/extradoc/changeset/e6c1d174b99a/ Log:merge diff --git a/planning/stm.txt b/planning/stm.txt --- a/planning/stm.txt +++ b/planning/stm.txt @@ -8,8

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4188:34f623b889f3 Date: 2012-04-12 12:17 +0200 http://bitbucket.org/pypy/extradoc/changeset/34f623b889f3/ Log:merge diff --git a/blog/draft/py3k-status-update-3.rst b/blog/draft/py3k-status-update-3.rst ---

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4182:c61a7069d337 Date: 2012-04-11 15:02 +0200 http://bitbucket.org/pypy/extradoc/changeset/c61a7069d337/ Log:merge diff --git a/blog/draft/py3k-activity-march.png b/blog/draft/py3k-activity-march.png new file mode

[pypy-commit] extradoc extradoc: merge heads

Author: Benjamin Peterson benja...@python.org Branch: extradoc Changeset: r4184:bb1caf50c520 Date: 2012-04-11 09:05 -0400 http://bitbucket.org/pypy/extradoc/changeset/bb1caf50c520/ Log:merge heads diff --git a/blog/draft/pycon-wrapup.rst b/blog/draft/pycon-wrapup.rst ---

[pypy-commit] extradoc extradoc: merge heads

Author: Armin Rigo ar...@tunes.org Branch: extradoc Changeset: r4168:9c8dcd01475e Date: 2012-03-31 14:21 +0200 http://bitbucket.org/pypy/extradoc/changeset/9c8dcd01475e/ Log:merge heads diff --git a/blog/draft/pycon-wrapup.rst b/blog/draft/pycon-wrapup.rst new file mode 100644 --- /dev/null

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4162:4a8442f9e157 Date: 2012-03-23 17:31 +0200 http://bitbucket.org/pypy/extradoc/changeset/4a8442f9e157/ Log:merge diff --git a/blog/draft/pycon-wrapup.rst b/blog/draft/pycon-wrapup.rst new file mode 100644 ---

[pypy-commit] extradoc extradoc: merge conflict?

Author: Alex Gaynor alex.gay...@gmail.com Branch: extradoc Changeset: r4144:0e2c2a1051e7 Date: 2012-03-09 15:13 -0800 http://bitbucket.org/pypy/extradoc/changeset/0e2c2a1051e7/ Log:merge conflict? ___ pypy-commit mailing list pypy-commit@python.org

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4129:5cf115078d22 Date: 2012-03-07 08:02 -0800 http://bitbucket.org/pypy/extradoc/changeset/5cf115078d22/ Log:merge diff --git a/talk/pycon2012/jit/instancemap.png b/talk/pycon2012/jit/instancemap.png new file mode

[pypy-commit] extradoc extradoc: merge heads

Author: Benjamin Peterson benja...@python.org Branch: extradoc Changeset: r4135:788923bf09fc Date: 2012-03-07 16:32 -0600 http://bitbucket.org/pypy/extradoc/changeset/788923bf09fc/ Log:merge heads diff --git a/talk/pycon2012/tutorial/examples/08_re_jit.py

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4117:3bc5037c8e82 Date: 2012-03-04 12:21 -0800 http://bitbucket.org/pypy/extradoc/changeset/3bc5037c8e82/ Log:merge diff --git a/blog/draft/py3k-status-update-1.rst b/blog/draft/py3k-status-update-1.rst ---

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4109:e8ce2e0db76c Date: 2012-02-29 12:56 -0800 http://bitbucket.org/pypy/extradoc/changeset/e8ce2e0db76c/ Log:merge diff --git a/planning/stm.txt b/planning/stm.txt --- a/planning/stm.txt +++ b/planning/stm.txt @@ -75,8

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4104:603e6334bd6c Date: 2012-02-22 10:19 -0700 http://bitbucket.org/pypy/extradoc/changeset/603e6334bd6c/ Log:merge diff --git a/talk/pycon2012/tutorial/emails/01_numpy.rst b/talk/pycon2012/tutorial/emails/01_numpy.rst

[pypy-commit] extradoc extradoc: merge

Author: Maciej Fijalkowski fij...@gmail.com Branch: extradoc Changeset: r4052:da88aafb0de1 Date: 2012-01-26 20:19 +0200 http://bitbucket.org/pypy/extradoc/changeset/da88aafb0de1/ Log:merge diff --git a/blog/draft/pypy-2011.rst b/blog/draft/pypy-2011.rst --- a/blog/draft/pypy-2011.rst +++

[pypy-commit] extradoc extradoc: merge heads

Author: Armin Rigo ar...@tunes.org Branch: extradoc Changeset: r4038:588db0e8396b Date: 2012-01-16 11:21 +0100 http://bitbucket.org/pypy/extradoc/changeset/588db0e8396b/ Log:merge heads diff --git a/blog/draft/numpy-internship.rst b/blog/draft/numpy-internship.rst new file mode 100644 ---

[pypy-commit] extradoc extradoc: merge heads

Author: Antonio Cuni anto.c...@gmail.com Branch: extradoc Changeset: r4026:56bab9df185f Date: 2012-01-13 15:26 +0100 http://bitbucket.org/pypy/extradoc/changeset/56bab9df185f/ Log:merge heads diff --git a/blog/draft/tm.rst b/blog/draft/tm.rst --- a/blog/draft/tm.rst +++ b/blog/draft/tm.rst

[pypy-commit] extradoc extradoc: Merge heads

Author: Romain Guillebert romain...@gmail.com Branch: extradoc Changeset: r4004:9601f2597df0 Date: 2012-01-07 18:27 +0100 http://bitbucket.org/pypy/extradoc/changeset/9601f2597df0/ Log:Merge heads diff --git a/sprintinfo/leysin-winter-2012/people.txt

[pypy-commit] extradoc extradoc: merge

Author: Carl Friedrich Bolz cfb...@gmx.de Branch: extradoc Changeset: r3999:a88377852aa3 Date: 2012-01-03 14:30 +0100 http://bitbucket.org/pypy/extradoc/changeset/a88377852aa3/ Log:merge diff --git a/blog/draft/matplotlib.rst b/blog/draft/matplotlib.rst new file mode 100644 --- /dev/null +++

  1   2   >