 yury
|
0654857ce1
Merged aarch64-android, x86_64-android targets and fixes for the Android target.
|
6 anos atrás |
 marco
|
1f921d4ac0
--- Merging r39866 into '.':
|
6 anos atrás |
|
marco
|
fa58ed1df7
--- Merging r39691 into '.':
|
6 anos atrás |
|
marco
|
3ecb0ecc11
--- Merging r39992 into '.':
|
6 anos atrás |
|
marco
|
9712af7fc4
--- Merging r39984 into '.':
|
6 anos atrás |
 pierre
|
6205e530aa
Merge commits 39912, 39914, 40001, 40115, 40132 and 40163
|
6 anos atrás |
|
pierre
|
36f9ce1cb2
Merge of trunk commits 39983,39986,40109
|
6 anos atrás |
|
marco
|
cddd8fbbf5
--- Merging r40213 into '.':
|
6 anos atrás |
|
marco
|
6574f0974a
--- Merging r40284 into '.':
|
6 anos atrás |
|
marco
|
3661b7bcfa
--- Merging r39886 into '.':
|
6 anos atrás |
|
marco
|
6f88dbd9d5
--- Merging r39878 into '.':
|
6 anos atrás |
|
marco
|
f42dffb36d
--- Merging r39877 into '.':
|
6 anos atrás |
|
marco
|
e1d32d0fef
# revisions: 39793,39850,39852,39910,40020,40021,40022,40024,40096
|
6 anos atrás |
|
marco
|
338873d7a7
--- Merging r39785 into '.':
|
7 anos atrás |
|
marco
|
2b01261f36
--- Recording mergeinfo for merge of r39673 into '.':
|
7 anos atrás |
|
marco
|
9135b53764
--- Merging r39770 into '.':
|
7 anos atrás |
|
marco
|
2f4f80a406
--- Merging r39747 into '.':
|
7 anos atrás |
|
marco
|
ee7090b118
--- Merging r39711 into '.':
|
7 anos atrás |
|
marco
|
edf32cd5dc
The Important Ones:
|
7 anos atrás |
|
marco
|
ced4e6c27d
--- Merging r39714 into '.':
|
7 anos atrás |
|
marco
|
a50560f383
--- Merging r39706 into '.':
|
7 anos atrás |
|
marco
|
d8cd1baf82
--- Merging r39670 into '.':
|
7 anos atrás |
|
marco
|
36b61f985f
--- Merging r39707 into '.':
|
7 anos atrás |
|
pierre
|
da2eca3b8e
Merge of trunk rev 39765, update of utils/fpcm/revision.inc after merge 39766
|
7 anos atrás |
|
pierre
|
9334eeaa7e
--- Merging r39756 and r39757 into 'fixes_3_2' branch:
|
7 anos atrás |
|
pierre
|
ecbaaac1b8
Commit updated revision.inc file
|
7 anos atrás |
|
marco
|
08f93784a5
--- Merging r39681 into '.':
|
7 anos atrás |
|
marco
|
c5e1d72b71
--- Merging r39666 into '.':
|
7 anos atrás |
|
marco
|
cdd16222d4
--- Merging r39657 into '.':
|
7 anos atrás |
|
marco
|
f53309b61c
--- Merging r39644 into '.':
|
7 anos atrás |
