 peter
|
d66504e48c
Merged revisions 12160 via svnmerge from
|
17 years ago |
 joost
|
8ed06a053b
Merged revisions 11432,11465,11469-11470,11487-11488,11490,11518-11521,11523,11528,11535,11551,11553,11555,11557,11562,11564,11571,11588,11605,11619,11621-11622,11628,11664-11667,11670,11683,11685,11689-11692,11694-11696,11698,11701-11702,11705-11707,11712-11718,11723-11726,11728-11729,11733-11737,11778,11780-11781,11785,11810,11822-11823,11831,11836,11848,11872,11876-11878,11881-11883,11889,11891-11895,11899-11902,11920-11925,11931-11932,11935,11938,11941,11986,11992,12014,12018,12037 via svnmerge from
|
17 years ago |
 Jonas Maebe
|
057f8aca20
* merged because revisions 11290 and 11295 (merged in r12147) depend on
|
17 years ago |
|
joost
|
9cf3a14ae8
Merged revisions 11596,11619,11621-11622,11628,11664-11667,11670,11672,11683,11685,11689-11692,11694-11696,11698,11701-11702,11705-11707,11712-11718,11723-11726,11728-11729,11733-11737,11773 via svnmerge from
|
17 years ago |
|
joost
|
8356cd891e
Merged revisions 11415,11417,11419 via svnmerge from
|
17 years ago |
|
joost
|
4b766510ab
Merged revisions 11290,11292-11295 via svnmerge from
|
17 years ago |
|
joost
|
47cdad34d8
Merged revisions 11595,11599,11619,11621-11622,11628,11662 via svnmerge from
|
17 years ago |
|
joost
|
9f548a4865
Merged revisions 11242,11249-11256,11258,11260,11264-11265,11271,11278,11280-11282,11286-11288,11292-11294,11297,11299-11300,11302,11304-11311,11313,11315-11316,11318-11319,11324-11326,11328-11333,11335-11336,11339-11340,11346-11347,11349,11362,11369,11371-11375,11393-11396,11401,11411-11414,11420,11422,11427-11428,11465,11469-11470,11487-11488,11490,11518-11521,11523,11528,11535,11551,11553,11555,11557,11562,11564,11571,11586,11588,11592 via svnmerge from
|
17 years ago |
|
joost
|
89a8d64e66
Merged revisions 11245 via svnmerge from
|
17 years ago |
|
peter
|
e51ce1ccb3
Merged revisions 11957 via svnmerge from
|
17 years ago |
|
peter
|
041ed53f08
Merged revisions 11953-11954,11956 via svnmerge from
|
17 years ago |
 marco
|
49585bd73d
Merged revisions 11884,11979,12035,12054,12056,12060,12066 via svnmerge from
|
17 years ago |
|
marco
|
7ddaf2ef0a
Merged revisions 11943,11967 via svnmerge from
|
17 years ago |
|
marco
|
8bbe5e86d2
* FreeBSD/x86 compiles again, probably makefile fix that was fixed in unmergable revs in 2.3.x
|
17 years ago |
|
marco
|
7719c4ff96
Merged revisions 11793 via svnmerge from
|
17 years ago |
|
marco
|
6ce16a6c3f
Merged revisions 11790 via svnmerge from
|
17 years ago |
|
Jonas Maebe
|
a42660db37
- undid merge of r11461: it adds extra inline specifiers, which is
|
17 years ago |
 Almindor
|
657bea6428
Merged revisions 11144,11148,11236,11348,11461,11994,12003 via svnmerge from
|
17 years ago |
|
Almindor
|
7f82e538cb
Merged revisions 11119,11338,11436,11485,11506,11527,11653,11659,11972,12001,12004 via svnmerge from
|
17 years ago |
|
Jonas Maebe
|
ad50bc7fb7
Merged revisions 11344 via svnmerge from
|
17 years ago |
 mazen
|
ee2b0346c4
Merged revisions 11880 via svnmerge from
|
17 years ago |
|
mazen
|
fd82dc959e
Blocked revisions 10843 via svnmerge
|
17 years ago |
 florian
|
7b25cbb3d0
Merged revisions 11262,11273,11498 via svnmerge from
|
17 years ago |
|
Jonas Maebe
|
7a1434fa47
Merged revisions 11693 via svnmerge from
|
17 years ago |
|
florian
|
4128c051ab
Merged revisions 10711,11343 via svnmerge from
|
17 years ago |
 michael
|
c8b8c34471
Merged revisions 12094 via svnmerge from
|
17 years ago |
|
florian
|
13f77aaa03
Merged revisions 10995,11001 via svnmerge from
|
17 years ago |
|
michael
|
6465ee5ae8
Merged revisions 12088 via svnmerge from
|
17 years ago |
|
michael
|
4e67b1006d
Merged revisions 11680,11683,11685,11689-11692,11694-11696,11698,11701-11702,11705-11707,11712-11718,11723-11726,11728-11729,11733-11737,11778,11780-11781,11785,11810,11822,11831,11836,11848,11872,11876-11878,11881-11883,11889,11891-11895,11899-11902,11920-11925,11931-11932,11935,11938,11941,11986,11992,12014,12018,12041-12042,12044,12046,12051-12053,12055,12058,12063,12067-12072,12074,12076,12079-12081,12083-12084,12086-12087 via svnmerge from
|
17 years ago |
|
michael
|
c23f9f0654
Merged revisions 12085 via svnmerge from
|
17 years ago |
