 yury
|
158a0f3a34
Merged revisions 8317 via svnmerge from
|
18 gadi atpakaļ |
 peter
|
a8126868b4
Merged revisions 8116 via svnmerge from
|
18 gadi atpakaļ |
|
peter
|
18838854f9
Merged revisions 8137 via svnmerge from
|
18 gadi atpakaļ |
|
peter
|
9438d57f6f
Merged revisions 8144 via svnmerge from
|
18 gadi atpakaļ |
|
peter
|
a8486ac4d2
Merged revisions 8161 via svnmerge from
|
18 gadi atpakaļ |
 florian
|
4bb997fa5f
Merged revisions 8209-8211 via svnmerge from
|
18 gadi atpakaļ |
|
florian
|
1c5005beb2
Merged revisions 7483,7486,7504,7506-7509,7522,7527,7534-7536,7558-7559,7563-7565,7567,7570-7571,7573-7576,7586,7589,7592-7594,7607,7612,7615,7619-7620,7622-7623,7626,7628,7631,7633,7646,7663,7677,7681-7683,7689,7697,7704-7712,7725,7736,7738,7740,7744-7746,7751,7753,7764,7767,7769-7770,7776-7777,7788,7830,7836-7839,7846,7849,7862,7864-7865,7869,7872,7877,7882,7927-7929,7953,7961,7967,7971,7986-7987,7990-7994,7998-8000,8004-8006,8008-8012,8016,8027,8034,8036-8037,8039,8044,8046,8048,8051,8060,8064,8066 via svnmerge from
|
18 gadi atpakaļ |
 joost
|
4a7a80bf01
Merged revisions 7313,7325,7354,7361,7374,7378 via svnmerge from
|
18 gadi atpakaļ |
|
joost
|
f2eaf1c77e
Merged revisions 7595,7701,7810,7842 via svnmerge from
|
18 gadi atpakaļ |
|
yury
|
bf4d4997b4
Merged revisions 7975,7977,7980 via svnmerge from
|
18 gadi atpakaļ |
|
yury
|
65ef20e0ed
Merged revisions 7970 via svnmerge from
|
18 gadi atpakaļ |
|
yury
|
1d82c8c5c2
Merged revisions 7911,7914,7917 via svnmerge from
|
18 gadi atpakaļ |
|
yury
|
eeb0b484b8
Merged revisions 7876 via svnmerge from
|
18 gadi atpakaļ |
 Jonas Maebe
|
60b30934da
Merged revisions 7847 via svnmerge from
|
18 gadi atpakaļ |
|
yury
|
66dc587977
Merged revisions 7863 via svnmerge from
|
18 gadi atpakaļ |
 daniel
|
86195562a7
- svnmerge is a piece of crap; manually remove file
|
18 gadi atpakaļ |
|
daniel
|
c6c016461c
Merged revisions 7823-7824,7826 via svnmerge from
|
18 gadi atpakaļ |
|
yury
|
64a6e6913b
Merged revisions 7735,7739 via svnmerge from
|
18 gadi atpakaļ |
|
yury
|
2fc115ba37
Merged revisions 7720-7724,7727,7728,7730,7731,7734 via svnmerge from
|
18 gadi atpakaļ |
|
peter
|
4cabd0e451
Merged revisions 7703 via svnmerge from
|
18 gadi atpakaļ |
|
peter
|
5740806aca
Merged revisions 7323,7519,7521,7530,7539,7542-7543 via svnmerge from
|
18 gadi atpakaļ |
|
peter
|
7da6003335
* manual cleanup of merge
|
18 gadi atpakaļ |
|
peter
|
96796db09f
Merged revisions 7523,7525-7526,7531-7532 via svnmerge from
|
18 gadi atpakaļ |
|
daniel
|
ca2f8ec17e
Merged revisions 7693 via svnmerge from
|
18 gadi atpakaļ |
|
Jonas Maebe
|
dc02fdbcfc
Merged revisions 7644-7645,7660-7662,7667,7670-7672 via svnmerge from
|
18 gadi atpakaļ |
|
Jonas Maebe
|
a0babc4df6
Merged revisions 7629-7630,7632 via svnmerge from
|
18 gadi atpakaļ |
|
Jonas Maebe
|
4764aba85e
Merged revisions 7608-7610,7614,7621 via svnmerge from
|
18 gadi atpakaļ |
|
Jonas Maebe
|
23fbc2ea00
Merged revisions 7596,7598-7599,7605 via svnmerge from
|
18 gadi atpakaļ |
|
peter
|
855e5cdd74
Merged revisions 6810,6999,7015,7123,7197,7305,7382,7390,7401,7409,7423,7487,7494,7500 via svnmerge from
|
18 gadi atpakaļ |
|
peter
|
82b2979c50
* manual merge of lineendings
|
18 gadi atpakaļ |
