Commits · 8314da1c62d6a19d9e44bb9c32db00c0af02676b · halo / development

08 Aug, 2015 10 commits

am : am : am : am : am : am :... · 8314da1c

Nick Kralevich authored 9 years ago

am 3728b128: am 97af61da: am 178f5eee: am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)

* commit '3728b128':
  Bump revision number for all system images

8314da1c

am : am : am : am : am : am :... · 3728b128

Nick Kralevich authored 9 years ago

am 97af61da: am 178f5eee: am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)

* commit '97af61da':
  Bump revision number for all system images

3728b128

am : am : am : am : am : am :... · 97af61da

Nick Kralevich authored 9 years ago

am 178f5eee: am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)

* commit '178f5eee':
  Bump revision number for all system images

97af61da

am : am : am : am : am : resolve merge... · 178f5eee

Nick Kralevich authored 9 years ago

am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)

* commit 'e1baec5d':
  Bump revision number for all system images

178f5eee

am : am : am : am : resolve merge conflicts of... · e1baec5d

Nick Kralevich authored 9 years ago

am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)

* commit '4393aeff':
  Bump revision number for all system images

e1baec5d

am : am : am : resolve merge conflicts of to... · 4393aeff

Nick Kralevich authored 9 years ago

am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)

* commit '947e4e27':
  Bump revision number for all system images

4393aeff

am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) · 947e4e27
Nick Kralevich authored 9 years ago
```
* commit '29b060fa':
  Bump revision number for all system images
```
947e4e27
am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) · 29b060fa
Nick Kralevich authored 9 years ago
```
* commit 'aed7823a':
  Bump revision number for all system images
```
29b060fa
resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) · aed7823a
Nick Kralevich authored 9 years ago
```
Change-Id: Iae7fe39e80a69f18025195d1a9074bd5c98ae904
```
aed7823a
resolve merge conflicts of 5e972519 to jb-mr1.1-docs · 8e4ac6bd
Nick Kralevich authored 9 years ago
```
Change-Id: Ie5af5f01ead4d29cf84d2951606ddcd9f95a5b70
```
8e4ac6bd

07 Aug, 2015 30 commits

am : am : am : (-s ours) am : am : am... · 73e98d27

Konstantinos Menychtas authored 9 years ago

am 0878662f: am e8641a98: am 202648b0: (-s ours) am ae1dae19: am ffb1640e: am 4ef13a69: (-s ours) am 14dcd775: am 40d02c8f: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix

* commit '0878662f':

73e98d27

am : am : am : (-s ours) am : am : am... · 895ff7f3

Konstantinos Menychtas authored 9 years ago

am 9780219a: am 980be81e: am 2c414f76: (-s ours) am b2cff440: am 18c63f0a: am 87cd4d75: (-s ours) am 9ccb1028: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix

* commit '9780219a':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix

895ff7f3

am : am : am : (-s ours) am : am : am... · 30461421

Konstantinos Menychtas authored 9 years ago

am 6285d756: am 043df767: am 474f468d: (-s ours) am 86317696: am c526381f: am 9cb9a14c: (-s ours) am bad193d9: am 91ac4618: am 0e94cee9: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

* commit '6285d756':
  DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

30461421

am : am : am : (-s ours) am : am : DO... · 1bbfccc1

Konstantinos Menychtas authored 9 years ago

am 0c635c71: am 2d5d97ef: am bc013aa0: (-s ours) am 8de93852: am 6384e218: DO NOT MERGE Increase the system-image revision number after opengl bug fix

* commit '0c635c71':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix

1bbfccc1

resolved conflicts for merge of d247f473 to jb-mr1-dev · 5e972519
Konstantinos Menychtas authored 9 years ago
```
Change-Id: Ib123931dc40f5feab99eb081a68993e94ba321f6
```
5e972519

am : am : (-s ours) am : am : am : (-s... · 0878662f

Konstantinos Menychtas authored 9 years ago

am e8641a98: am 202648b0: (-s ours) am ae1dae19: am ffb1640e: am 4ef13a69: (-s ours) am 14dcd775: am 40d02c8f: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix

* commit 'e8641a98':

0878662f

am : am : (-s ours) am : am : am : (-s... · 9780219a

Konstantinos Menychtas authored 9 years ago

am 980be81e: am 2c414f76: (-s ours) am b2cff440: am 18c63f0a: am 87cd4d75: (-s ours) am 9ccb1028: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix

* commit '980be81e':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix

9780219a

am : (-s ours) am : am : am : (-s ours) am... · e8641a98

Konstantinos Menychtas authored 9 years ago

am 202648b0: (-s ours) am ae1dae19: am ffb1640e: am 4ef13a69: (-s ours) am 14dcd775: am 40d02c8f: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix

* commit '202648b0':

e8641a98

am : (-s ours) am : am : am : (-s ours) am... · 980be81e

Konstantinos Menychtas authored 9 years ago

am 2c414f76: (-s ours) am b2cff440: am 18c63f0a: am 87cd4d75: (-s ours) am 9ccb1028: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix

* commit '2c414f76':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix

980be81e

am : am : am : (-s ours) am : am : am... · 202648b0

Konstantinos Menychtas authored 9 years ago

am ae1dae19: am ffb1640e: am 4ef13a69: (-s ours) am 14dcd775: am 40d02c8f: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix

* commit 'ae1dae19':

202648b0

am : am : am : (-s ours) am : am : DO... · 2c414f76

Konstantinos Menychtas authored 9 years ago

am b2cff440: am 18c63f0a: am 87cd4d75: (-s ours) am 9ccb1028: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix

* commit 'b2cff440':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix

2c414f76

am : am : (-s ours) am : am : am : (-s... · 6285d756

Konstantinos Menychtas authored 9 years ago

am 043df767: am 474f468d: (-s ours) am 86317696: am c526381f: am 9cb9a14c: (-s ours) am bad193d9: am 91ac4618: am 0e94cee9: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

* commit '043df767':
  DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

6285d756

am : am : (-s ours) am : am : am : DO... · ae1dae19

Konstantinos Menychtas authored 9 years ago

am ffb1640e: am 4ef13a69: (-s ours) am 14dcd775: am 40d02c8f: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix

* commit 'ffb1640e':

ae1dae19

am : am : (-s ours) am : am : DO NOT MERGE... · b2cff440

Konstantinos Menychtas authored 9 years ago

am 18c63f0a: am 87cd4d75: (-s ours) am 9ccb1028: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix

* commit '18c63f0a':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix

b2cff440

resolved conflicts for merge of 5e69741e to klp-modular-dev · bc7cb7d9
Nick Kralevich authored 9 years ago
```
Change-Id: I6717f689995cafaa38c23bb8f2a64900bcc36004
```
bc7cb7d9

am : am : (-s ours) am : am : DO NOT MERGE... · 0c635c71

Konstantinos Menychtas authored 9 years ago

am 2d5d97ef: am bc013aa0: (-s ours) am 8de93852: am 6384e218: DO NOT MERGE Increase the system-image revision number after opengl bug fix

* commit '2d5d97ef':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix

0c635c71

am : (-s ours) am : am : am : (-s ours) am... · 043df767

Konstantinos Menychtas authored 9 years ago

am 474f468d: (-s ours) am 86317696: am c526381f: am 9cb9a14c: (-s ours) am bad193d9: am 91ac4618: am 0e94cee9: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

* commit '474f468d':
  DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

043df767

am : (-s ours) am : am : am : DO NOT MERGE... · ffb1640e

Konstantinos Menychtas authored 9 years ago

am 4ef13a69: (-s ours) am 14dcd775: am 40d02c8f: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix

* commit '4ef13a69':

ffb1640e

am : (-s ours) am : am : DO NOT MERGE Increase the... · 18c63f0a

Konstantinos Menychtas authored 9 years ago

am 87cd4d75: (-s ours) am 9ccb1028: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix

* commit '87cd4d75':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix

18c63f0a

am : am : am : (-s ours) am : am : am... · 474f468d

Konstantinos Menychtas authored 9 years ago

am 86317696: am c526381f: am 9cb9a14c: (-s ours) am bad193d9: am 91ac4618: am 0e94cee9: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

* commit '86317696':
  DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

474f468d

am : (-s ours) am : am : DO NOT MERGE Increase the... · 2d5d97ef

Konstantinos Menychtas authored 9 years ago

am bc013aa0: (-s ours) am 8de93852: am 6384e218: DO NOT MERGE Increase the system-image revision number after opengl bug fix

* commit 'bc013aa0':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix

2d5d97ef

am : am : am : DO NOT MERGE Increase the system-image... · 4ef13a69

Konstantinos Menychtas authored 9 years ago

am 14dcd775: am 40d02c8f: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix

* commit '14dcd775':

4ef13a69

am : am : DO NOT MERGE Increase the system-image revision... · 87cd4d75

Konstantinos Menychtas authored 9 years ago

am 9ccb1028: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix

* commit '9ccb1028':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix

87cd4d75

am : am : (-s ours) am : am : am : DO... · 86317696

Konstantinos Menychtas authored 9 years ago

am c526381f: am 9cb9a14c: (-s ours) am bad193d9: am 91ac4618: am 0e94cee9: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

* commit 'c526381f':
  DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

86317696

am 40d02c8f: am ca8720d5: DO NOT MERGE Increase the system-image revision... · 14dcd775
Konstantinos Menychtas authored 9 years ago
```
am 40d02c8f: am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix

* commit '40d02c8f':
```
14dcd775

am : am : DO NOT MERGE Increase the system-image revision... · bc013aa0

Konstantinos Menychtas authored 9 years ago

am 8de93852: am 6384e218: DO NOT MERGE Increase the system-image revision number after opengl bug fix

* commit '8de93852':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix

bc013aa0

am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix · 9ccb1028
Konstantinos Menychtas authored 9 years ago
```
* commit 'ca8720d5':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
```
9ccb1028

am : (-s ours) am : am : am : DO NOT MERGE... · c526381f

Konstantinos Menychtas authored 9 years ago

am 9cb9a14c: (-s ours) am bad193d9: am 91ac4618: am 0e94cee9: DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

* commit '9cb9a14c':
  DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

c526381f

am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix · 40d02c8f
Konstantinos Menychtas authored 9 years ago
```
* commit 'ca8720d5':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
```
40d02c8f

DO NOT MERGE Increase the system-image revision number after opengl bug fix · ca8720d5

Konstantinos Menychtas authored 9 years ago

Back-ported bug-fix 030a0cbdedcf255c100ed09ad81b66be310d83c7
(opengl: Fix QemuPipeStream::readFully reading beyond end of buffer)
warrants a system image update. This patch increases the revision
number for released images appropriately.

Change-Id: Ib64a48ddf825df7fc25fe5fccd70be5dfb1b425e

ca8720d5