diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2011-12-01 21:28:42 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2011-12-01 21:28:42 +0000 |
| commit | c3ea1e4ac8b2ff0f13d86289562a477f0ae3fd6b (patch) | |
| tree | 0564110a9683aada0df7867fda8647022f8257a1 | |
| parent | 49e704eaa7ef1fcfe2ce821a00c01d850bbce818 (diff) | |
| parent | 1c8a881daaca6fe0646a425b0970fb3ad25f6732 (diff) | |
Merge upstream into qemu-linaro2011.12
| -rw-r--r-- | VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -0.15.94 +1.0 |