 Jonas Maebe
|
8ed055e4bf
--- Merging r44096 into '.':
|
%!s(int64=4) %!d(string=hai) anos |
 marco
|
fb97d7c467
--- Merging r45802 into '.':
|
%!s(int64=4) %!d(string=hai) anos |
 florian
|
d758c95e9b
-- Zusammenführen von r46778 in ».«:
|
%!s(int64=4) %!d(string=hai) anos |
|
Jonas Maebe
|
2bd8eb2bc4
--- Merging r48098 into '.':
|
%!s(int64=4) %!d(string=hai) anos |
|
marco
|
0aed55bcbc
# revisions: 47932
|
%!s(int64=4) %!d(string=hai) anos |
|
marco
|
7bc877cc94
* Reverse-merged /trunk:r47746
|
%!s(int64=4) %!d(string=hai) anos |
 pierre
|
679c1c9199
Merge commit #47157
|
%!s(int64=4) %!d(string=hai) anos |
 svenbarth
|
2270d5c655
Merged revision(s) 48006 from trunk:
|
%!s(int64=4) %!d(string=hai) anos |
|
pierre
|
dbe1e2bff7
* Merging of commits changing OpenBSD types.
|
%!s(int64=4) %!d(string=hai) anos |
|
marco
|
fd02f9b727
# revisions: 44426,44562,45115,45371,45375,45511,44641,44559,47746
|
%!s(int64=4) %!d(string=hai) anos |
|
pierre
|
e935ab3983
Merge of commit #47228
|
%!s(int64=4) %!d(string=hai) anos |
|
pierre
|
a3db71325e
Merge of commit #47207
|
%!s(int64=4) %!d(string=hai) anos |
|
marco
|
c612e9c69e
--- Merging r43776 into '.':
|
%!s(int64=4) %!d(string=hai) anos |
|
marco
|
0df7437a47
--- Merging r47159 into '.':
|
%!s(int64=4) %!d(string=hai) anos |
|
marco
|
ba6989a42f
--- Merging r43121 into '.':
|
%!s(int64=4) %!d(string=hai) anos |
|
florian
|
06a0e48958
-- Zusammenführen von r43183 in ».«:
|
%!s(int64=4) %!d(string=hai) anos |
|
florian
|
643d7c4d02
--- Merging r40738 into '.':
|
%!s(int64=4) %!d(string=hai) anos |
|
florian
|
e232588635
-- Zusammenführen von r46974 in ».«:
|
%!s(int64=4) %!d(string=hai) anos |
|
florian
|
7eeaf5d5a0
-- Zusammenführen von r46973 in ».«:
|
%!s(int64=4) %!d(string=hai) anos |
|
marco
|
83f7e7e3dc
--- Merging r46853 into '.':
|
%!s(int64=4) %!d(string=hai) anos |
|
florian
|
4995677b0f
--- Zusammenführung
|
%!s(int64=4) %!d(string=hai) anos |
|
florian
|
91382b5deb
* manually merged parts of r42260 to enable further merges
|
%!s(int64=4) %!d(string=hai) anos |
|
marco
|
7f5361f301
--- Merging r47820 into '.':
|
%!s(int64=4) %!d(string=hai) anos |
|
marco
|
ec6d8f71a2
--- Merging r47891 into '.':
|
%!s(int64=4) %!d(string=hai) anos |
 michael
|
0067e6663c
* Merging revisions 47350 from trunk:
|
%!s(int64=4) %!d(string=hai) anos |
|
svenbarth
|
3f5b72806b
Merged revision(s) 47799 from trunk:
|
%!s(int64=4) %!d(string=hai) anos |
|
svenbarth
|
cf6e6c3d92
Merged revision(s) 47687 from trunk:
|
%!s(int64=4) %!d(string=hai) anos |
|
pierre
|
8e9f91ee79
Merge commit 47798 to fixes branch
|
%!s(int64=4) %!d(string=hai) anos |
|
pierre
|
918ca565f2
Merge commit 44291
|
%!s(int64=4) %!d(string=hai) anos |
|
svenbarth
|
f3c1733daa
* undo merge of 45365 as it requires another revision that's only in trunk
|
%!s(int64=4) %!d(string=hai) anos |
