 Jonas Maebe
|
73cae02c20
--- Merging r29821 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
 marco
|
362fce04c9
--- Merging r31942 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
|
marco
|
31ab63461e
--- Merging r33511 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
 yury
|
b3e34efbf3
* Fixed compilation after merge.
|
%!s(int64=9) %!d(string=hai) anos |
|
yury
|
9e4fbe1f82
* Minor fix after merge.
|
%!s(int64=9) %!d(string=hai) anos |
|
yury
|
3006670da1
Merged revision(s) 32052 from trunk:
|
%!s(int64=9) %!d(string=hai) anos |
|
yury
|
60f32f6edd
Merged revision(s) 32075, 32077 from trunk:
|
%!s(int64=9) %!d(string=hai) anos |
|
yury
|
fccd5e534d
Merged revision(s) 31682, 31703-31704, 31719, 31761-31762, 32008, 32021-32024, 32033, 32035 from trunk (Android PIC support):
|
%!s(int64=9) %!d(string=hai) anos |
|
yury
|
4d62e12dfe
Merged revision(s) 32020, 32036, 32536 from trunk (i386 PIC):
|
%!s(int64=9) %!d(string=hai) anos |
|
yury
|
463152d34b
Merged revision(s) 31681, 31706, 31712, 31728, 31730, 31755 from trunk (ARM PIC):
|
%!s(int64=9) %!d(string=hai) anos |
|
yury
|
30c1bd9125
Merged revision(s) 33435-33436 from trunk:
|
%!s(int64=9) %!d(string=hai) anos |
|
marco
|
f7e1b90f59
--- Merging r32822 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
|
marco
|
4029ad684f
--- Merging r32821 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
|
marco
|
6ad43fd7c7
--- Merging r33361 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
|
marco
|
c301430a96
--- Merging r31299 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
|
marco
|
4419866710
--- Merging r30250 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
|
marco
|
b0ce5316c1
* merge r33419.
|
%!s(int64=9) %!d(string=hai) anos |
|
marco
|
ef951c96be
--- Merging r32054 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
|
marco
|
e17f99ed84
--- Recording mergeinfo for merge of r31987 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
|
marco
|
0bcbb4b368
--- Merging r33011 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
|
marco
|
ff73367b4c
--- Merging r33063 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
|
marco
|
6040c041e4
--- Merging r32541 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
|
marco
|
8c68be3e0d
--- Merging r33131 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
|
marco
|
158da745d0
--- Merging r29678 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
|
marco
|
8cc21d5591
--- Merging r31773 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
|
marco
|
5f8057775b
--- Merging r30757 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
|
marco
|
c0cfae7867
--- Merging r30276 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
|
marco
|
f767c5b066
--- Merging r33006 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
|
marco
|
3b78410f11
--- Merging r29773 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
|
marco
|
8256d24725
--- Merging r31381 into '.':
|
%!s(int64=9) %!d(string=hai) anos |
