Commits · upstream/2.14.0+dfsg · Hypra / pyatspi

Oct 09, 2014

Merge branch 'upstream' into upstream-dfsg · cf43c26a

Samuel Thibault authored Oct 09, 2014

Conflicts:
	tests/pyatspi/accessibletest.py
	tests/pyatspi/actiontest.py
	tests/pyatspi/componenttest.py
	tests/pyatspi/desktoptest.py
	tests/pyatspi/pasytest/Pasy.py
	tests/pyatspi/relationtest.py
	tests/pyatspi/statetest.py
	tests/pyatspi/testrunner
	tests/pyatspi/testrunner.in

upstream/2.14.0+dfsg

cf43c26a

Imported Upstream version 2.14.0 · a5c1a07a
Samuel Thibault authored Oct 09, 2014

upstream/2.14.0

a5c1a07a

Aug 29, 2014
- Merge branch 'upstream' into upstream-dfsg · fdd61983
  Samuel Thibault authored Aug 30, 2014
```
Conflicts:
	tests/Makefile.in
	tests/apps/Makefile.in
	tests/data/Makefile.in
	tests/dummyatk/Makefile.in
	tests/pyatspi/Makefile.in
	tests/pyatspi/pasytest/Makefile.in
```
  upstream/2.12.0+dfsg
  
  fdd61983
- Imported Upstream version 2.12.0 · e575fb37
  Samuel Thibault authored Aug 30, 2014
  
  upstream/2.12.0
  
  e575fb37
- Imported Upstream version 2.12.0 · 01556402
  Samuel Thibault authored Aug 30, 2014
  
  01556402
Sep 24, 2013
- Merge tag 'upstream/2.10.0' into upstream-dfsg · eed9437b
  Luke Yelavich authored Sep 24, 2013
```
Upstream version 2.10.0
```
  upstream/2.10.0+dfsg
  
  eed9437b
- Imported Upstream version 2.10.0 · 896f50e4
  Luke Yelavich authored Sep 24, 2013
  
  upstream/2.10.0
  
  896f50e4
Sep 17, 2013
- Merge tag 'upstream/2.9.92' into upstream-dfsg · 8e9f8a26
  Luke Yelavich authored Sep 17, 2013
```
Conflicts:
	tests/pyatspi/testrunner
```
  upstream/2.9.92+dfsg
  
  8e9f8a26
- Imported Upstream version 2.9.92 · c65e2751
  Luke Yelavich authored Sep 17, 2013
  
  upstream/2.9.92
  
  c65e2751
Aug 20, 2013
- Merge tag 'upstream/2.9.90' into upstream-dfsg · d8419597
  Luke Yelavich authored Aug 20, 2013
```
Upstream version 2.9.90
```
  upstream/2.9.90+dfsg
  
  d8419597
- Imported Upstream version 2.9.90 · 278b59a9
  Luke Yelavich authored Aug 20, 2013
  
  upstream/2.9.90
  
  278b59a9
Jun 17, 2013
- Merge branch 'upstream' into upstream-dfsg · c8127660
  Luke Yelavich authored Jun 18, 2013
  
  upstream/2.9.3+dfsg
  
  c8127660
- Imported Upstream version 2.9.3 · 7fd078a2
  Luke Yelavich authored Jun 18, 2013
  
  upstream/2.9.3
  
  7fd078a2
May 28, 2013
- Merge branch 'upstream' into upstream-dfsg · e78cbfbe
  Luke Yelavich authored May 29, 2013
  
  upstream/2.9.2+dfsg
  
  e78cbfbe
- Imported Upstream version 2.9.2 · 433347da
  Luke Yelavich authored May 29, 2013
  
  upstream/2.9.2
  
  433347da
Mar 25, 2013
- Merge branch 'upstream' into upstream-dfsg · 9e8fb0f3
  Luke Yelavich authored Mar 26, 2013
  
  upstream/2.8.0+dfsg
  
  9e8fb0f3
- Imported Upstream version 2.8.0 · 7b6bee24
  Luke Yelavich authored Mar 26, 2013
  
  upstream/2.8.0
  
  7b6bee24
Mar 05, 2013
- Merge branch 'upstream' into upstream-dfsg · b04b3ff3
  Luke Yelavich authored Mar 05, 2013
  
  upstream/2.7.91+dfsg
  
  b04b3ff3
- Imported Upstream version 2.7.91 · 277f84d7
  Luke Yelavich authored Mar 05, 2013
  
  upstream/2.7.91
  
  277f84d7
Feb 04, 2013
- Merge branch 'upstream' into upstream-dfsg · a1044923
  Luke Yelavich authored Feb 05, 2013
```
Conflicts:
	tests/pyatspi/testrunner
```
  upstream/2.7.5+dfsg
  
  a1044923
- Imported Upstream version 2.7.5 · 6be0d4aa
  Luke Yelavich authored Feb 05, 2013
  
  upstream/2.7.5
  
  6be0d4aa
Nov 21, 2012
- Merge branch 'upstream' into upstream-dfsg · d8914a69
  Luke Yelavich authored Nov 21, 2012
  
  upstream/2.7.2+dfsg
  
  d8914a69
- Imported Upstream version 2.7.2 · ab12b8c8
  Luke Yelavich authored Nov 21, 2012
  
  upstream/2.7.2
  
  ab12b8c8
Oct 22, 2012
- Merge branch 'upstream' into upstream-dfsg · c1ca64f2
  Samuel Thibault authored Oct 22, 2012
```
Conflicts:
	tests/pyatspi/testrunner
```
  upstream/2.7.1+dfsg
  
  c1ca64f2
- Imported Upstream version 2.7.1 · 9d5f465c
  Samuel Thibault authored Oct 22, 2012
  
  upstream/2.7.1
  
  9d5f465c
- Revert "Imported Upstream version 2.7.1" · a667519f
  Samuel Thibault authored Oct 22, 2012
```
This reverts commit 6566f780.

This shouldn't have been imported into the dfsg branch
```
  a667519f
- Imported Upstream version 2.7.1 · 6566f780
  Samuel Thibault authored Oct 22, 2012
  
  6566f780
Sep 24, 2012
- Merge tag 'upstream/2.6.0' into upstream-dfsg · 99273f4b
  Luke Yelavich authored Sep 25, 2012
```
Upstream version 2.6.0
```
  upstream/2.6.0+dfsg
  
  99273f4b
- Imported Upstream version 2.6.0 · 04cd552f
  Luke Yelavich authored Sep 25, 2012
  
  upstream/2.6.0
  
  04cd552f
Sep 18, 2012
- Merge tag 'upstream/2.5.92' into upstream-dfsg · 66e3b7d4
  Luke Yelavich authored Sep 18, 2012
```
Upstream version 2.5.92

Conflicts:
	tests/Makefile.in
	tests/apps/Makefile.in
	tests/data/Makefile.in
	tests/dummyatk/Makefile.in
	tests/pyatspi/Makefile.in
	tests/pyatspi/pasytest/Makefile.in
```
  upstream/2.5.92+dfsg
  
  66e3b7d4
- Imported Upstream version 2.5.92 · a3244587
  Luke Yelavich authored Sep 18, 2012
  
  upstream/2.5.92
  
  a3244587
Sep 05, 2012
- Merge branch 'upstream' into upstream-dfsg · c53838e8
  Luke Yelavich authored Sep 05, 2012
```
Conflicts:
	tests/pyatspi/testrunner
```
  upstream/2.5.91+dfsg
  
  c53838e8
- Imported Upstream version 2.5.91 · 6869e968
  Luke Yelavich authored Sep 05, 2012
  
  upstream/2.5.91
  
  6869e968
Aug 07, 2012
- Merge branch 'upstream' into upstream-dfsg · c3cabb0a
  Luke Yelavich authored Aug 07, 2012
```
Conflicts:
	tests/pyatspi/testrunner
```
  upstream/2.5.5+dfsg
  
  c3cabb0a
- Imported Upstream version 2.5.5 · e058ddca
  Luke Yelavich authored Aug 07, 2012
  
  upstream/2.5.5
  
  e058ddca
Jul 16, 2012
- Merge branch 'upstream' into upstream-dfsg · 8ca50d48
  Luke Yelavich authored Jul 17, 2012
```
Conflicts:
	tests/pyatspi/testrunner
```
  upstream/2.5.4+dfsg
  
  8ca50d48
- Imported Upstream version 2.5.4 · 35cea7ed
  Luke Yelavich authored Jul 17, 2012
  
  upstream/2.5.4
  
  35cea7ed
Jun 26, 2012
- Merge branch 'upstream' into upstream-dfsg · c6fdd9c6
  Luke Yelavich authored Jun 26, 2012
```
Conflicts:
	tests/Makefile.in
	tests/apps/Makefile.in
	tests/data/Makefile.in
	tests/dummyatk/Makefile.in
	tests/pyatspi/Makefile.in
	tests/pyatspi/pasytest/Makefile.in
	tests/pyatspi/testrunner
```
  upstream/2.5.3+dfsg
  
  c6fdd9c6
- Imported Upstream version 2.5.3 · 42c27c23
  Luke Yelavich authored Jun 26, 2012
  
  upstream/2.5.3
  
  42c27c23
Jun 05, 2012
- Merge branch 'upstream' into upstream-dfsg · 3f0c5bb2
  Samuel Thibault authored Jun 06, 2012
```
Conflicts:
	tests/pyatspi/testrunner
```
  upstream/2.5.2+dfsg
  
  3f0c5bb2