[vim/f14/master: 85/85] Merge branch 'master' into f14
Karsten Hopp
karsten at fedoraproject.org
Tue Nov 16 16:58:45 UTC 2010
commit 027484f7aa8891c8a20b6dd840c2646a2098fc84
Merge: aa4ff92 f616a1d
Author: Karsten Hopp <karsten at redhat.com>
Date: Tue Nov 16 17:56:58 2010 +0100
Merge branch 'master' into f14
* master: (84 commits)
- patchlevel 56
- patchlevel 056
- patchlevel 55
- patchlevel 055
- patchlevel 054
- patchlevel 053
- patchlevel 052
- patchlevel 51
- patchlevel 051
- patchlevel 50
- patchlevel 050
- patchlevel 049
- patchlevel 48
- patchlevel 048
- patchlevel 47
- patchlevel 047
- patchlevel 46
- patchlevel 046
- patchlevel 045
- patchlevel 044
...
Conflicts:
vim.spec
.gitignore | 1 +
7.2.001 | 61 -
7.2.002 | 47 -
7.2.003 | 107 -
7.2.004 | 103 -
7.2.005 | 149 -
7.2.006 | 50 -
7.2.007 | 493 --
7.2.008 | 63 -
7.2.009 | 67 -
7.2.010 | 206 -
7.2.011 | 105 -
7.2.012 | 53 -
7.2.013 | 135 -
7.2.014 | 52 -
7.2.015 | 82 -
7.2.016 | 166 -
7.2.017 | 162 -
7.2.018 | 45 -
7.2.019 | 65 -
7.2.020 | 54 -
7.2.021 | 147 -
7.2.022 | 140 -
7.2.023 | 65 -
7.2.024 | 50 -
7.2.025 | 54 -
7.2.026 | 105 -
7.2.027 | 98 -
7.2.028 | 53 -
7.2.029 | 44 -
7.2.030 | 51 -
7.2.031 | 1281 ----
7.2.032 | 55 -
7.2.033 | 78 -
7.2.034 | 81 -
7.2.035 | 128 -
7.2.036 | 276 -
7.2.037 | 53 -
7.2.038 | 86 -
7.2.039 | 46 -
7.2.040 | 64 -
7.2.041 | 729 ---
7.2.042 | 166 -
7.2.043 | 78 -
7.2.044 | 161 -
7.2.045 | 67 -
7.2.046 | 55 -
7.2.047 | 88 -
7.2.048 | 160 -
7.2.049 | 1193 ----
7.2.050 | 316 -
7.2.051 | 411 --
7.2.052 | 83 -
7.2.053 | 58 -
7.2.054 | 68 -
7.2.055 | 1271 ----
7.2.056 | 57 -
7.2.057 | 111 -
7.2.058 | 83 -
7.2.059 | 70 -
7.2.060 | 1102 ----
7.2.061 | 56 -
7.2.062 | 55 -
7.2.063 | 103 -
7.2.064 | 66 -
7.2.065 | 177 -
7.2.066 | 70 -
7.2.067 | 52 -
7.2.068 | 101 -
7.2.069 | 52 -
7.2.070 | 566 --
7.2.071 | 81 -
7.2.072 | 56 -
7.2.073 | 135 -
7.2.074 | 54 -
7.2.075 | 58 -
7.2.076 | 86 -
7.2.077 | 164 -
7.2.078 | 120 -
7.2.079 | 229 -
7.2.080 | 365 --
7.2.081 | 60 -
7.2.082 | 77 -
7.2.083 | 54 -
7.2.084 | 144 -
7.2.085 | 62 -
7.2.086 | 98 -
7.2.087 | 53 -
7.2.088 | 99 -
7.2.089 | 91 -
7.2.090 | 130 -
7.2.091 | 63 -
7.2.092 | 164 -
7.2.093 | 234 -
7.2.094 | 112 -
7.2.095 | 63 -
7.2.096 | 54 -
7.2.097 | 54 -
7.2.098 | 69 -
7.2.099 | 127 -
7.2.100 | 132 -
7.2.101 | 47 -
7.2.102 | 47 -
7.2.103 | 216 -
7.2.104 | 51 -
7.2.105 | 72 -
7.2.106 | 103 -
7.2.107 | 56 -
7.2.108 | 55 -
7.2.109 | 423 --
7.2.110 | 53 -
7.2.111 | 88 -
7.2.112 | 47 -
7.2.113 | 99 -
7.2.114 | 86 -
7.2.115 | 133 -
7.2.116 | 55 -
7.2.117 | 107 -
7.2.118 | 78 -
7.2.119 | 51 -
7.2.120 | 277 -
7.2.121 | 180 -
7.2.122 | 80 -
7.2.123 | 50 -
7.2.124 | 122 -
7.2.125 | 161 -
7.2.126 | 174 -
7.2.127 | 59 -
7.2.128 | 52 -
7.2.129 | 73 -
7.2.130 | 413 --
7.2.131 | 83 -
7.2.132 | 268 -
7.2.133 | 53 -
7.2.134 | 68 -
7.2.135 | 85 -
7.2.136 | 47 -
7.2.137 | 343 -
7.2.138 | 160 -
7.2.139 | 79 -
7.2.140 | 58 -
7.2.141 | 239 -
7.2.142 | 61 -
7.2.143 | 234 -
7.2.144 | 78 -
7.2.145 | 125 -
7.2.146 | 110 -
7.2.147 | 53 -
7.2.148 | 145 -
7.2.149 | 672 --
7.2.150 | 1325 ----
7.2.151 | 53 -
7.2.152 | 104 -
7.2.153 | 97 -
7.2.154 | 71 -
7.2.155 | 45 -
7.2.156 | 181 -
7.2.157 | 144 -
7.2.158 | 63 -
7.2.159 | 71 -
7.2.160 | 52 -
7.2.161 | 205 -
7.2.162 | 75 -
7.2.163 | 51 -
7.2.164 | 139 -
7.2.165 | 58 -
7.2.166 | 425 --
7.2.167 | 1873 ------
7.2.168 | 74 -
7.2.169 | 1214 ----
7.2.170 | 179 -
7.2.171 | 80 -
7.2.172 | 59 -
7.2.173 | 719 ---
7.2.174 | 1718 ------
7.2.175 | 51 -
7.2.176 | 207 -
7.2.177 | 2726 --------
7.2.178 | 150 -
7.2.179 | 100 -
7.2.180 | 6520 --------------------
7.2.181 | 1978 ------
7.2.182 | 66 -
7.2.183 | 1846 ------
7.2.184 | 3646 -----------
7.2.185 | 305 -
7.2.186 | 331 -
7.2.187 | 125 -
7.2.188 | 278 -
7.2.189 | 86 -
7.2.190 | 182 -
7.2.191 | 3705 -----------
7.2.192 | 135 -
7.2.193 | 53 -
7.2.194 | 44 -
7.2.195 | 79 -
7.2.196 | 84 -
7.2.197 | 53 -
7.2.198 | 60 -
7.2.199 | 52 -
7.2.200 | 348 --
7.2.201 | 494 --
7.2.202 | 62 -
7.2.203 | 1496 -----
7.2.204 | 137 -
7.2.205 | 81 -
7.2.206 | 46 -
7.2.207 | 69 -
7.2.208 | 82 -
7.2.209 | 82 -
7.2.210 | 58 -
7.2.211 | 52 -
7.2.212 | 62 -
7.2.213 | 53 -
7.2.214 | 65 -
7.2.215 | 310 -
7.2.216 | 137 -
7.2.217 | 57 -
7.2.218 | 52 -
7.2.219 | 71 -
7.2.220 | 95 -
7.2.221 | 247 -
7.2.222 | 59 -
7.2.223 | 165 -
7.2.224 | 88 -
7.2.225 | 97 -
7.2.226 | 268 -
7.2.227 | 52 -
7.2.228 | 573 --
7.2.229 | 60 -
7.2.230 | 87 -
7.2.231 | 49 -
7.2.232 | 102 -
7.2.233 | 96 -
7.2.234 | 111 -
7.2.235 | 94 -
7.2.236 | 81 -
7.2.237 | 76 -
7.2.238 | 117 -
7.2.239 | 145 -
7.2.240 | 69 -
7.2.241 | 169 -
7.2.242 | 89 -
7.2.243 | 67 -
7.2.244 | 174 -
7.2.245 | 165 -
7.2.246 | 53 -
7.2.247 | 86 -
7.2.248 | 158 -
7.2.249 | 47 -
7.2.250 | 55 -
7.2.251 | 71 -
7.2.252 | 51 -
7.2.253 | 143 -
7.2.254 | 52 -
7.2.255 | 71 -
7.2.256 | 59 -
7.2.257 | 61 -
7.2.258 | 74 -
7.2.259 | 160 -
7.2.260 | 155 -
7.2.261 | 83 -
7.2.262 | 189 -
7.2.263 | 87 -
7.2.264 | 168 -
7.2.265 | 56 -
7.2.266 | 244 -
7.2.267 | 47 -
7.2.268 | 80 -
7.2.269 | 261 -
7.2.270 | 72 -
7.2.271 | 92 -
7.2.272 | 82 -
7.2.273 | 130 -
7.2.274 | 130 -
7.2.275 | 95 -
7.2.276 | 63 -
7.2.277 | 66 -
7.2.278 | 74 -
7.2.279 | 120 -
7.2.280 | 251 -
7.2.281 | 81 -
7.2.282 | 47 -
7.2.283 | 73 -
7.2.284 | 52 -
7.2.285 | 56 -
7.2.286 | 227 -
7.2.287 | 54 -
7.2.288 | 52 -
7.2.289 | 120 -
7.2.290 | 157 -
7.2.291 | 53 -
7.2.292 | 55 -
7.2.293 | 66 -
7.2.294 | 285 -
7.2.295 | 142 -
7.2.296 | 53 -
7.2.297 | 70 -
7.2.298 | 48 -
7.2.299 | 54 -
7.2.300 | 201 -
7.2.301 | 777 ---
7.2.302 | 140 -
7.2.303 | 70 -
7.2.304 | 58 -
7.2.305 | 105 -
7.2.306 | 48 -
7.2.307 | 181 -
7.2.308 | 182 -
7.2.309 | 48 -
7.2.310 | 63 -
7.2.311 | 52 -
7.2.312 | 312 -
7.2.313 | 117 -
7.2.314 | 56 -
7.2.315 | 134 -
7.2.316 | 83 -
7.2.317 | 148 -
7.2.318 | 91 -
7.2.319 | 63 -
7.2.320 | 199 -
7.2.321 | 59 -
7.2.322 | 49 -
7.2.323 | 95 -
7.2.324 | 66 -
7.2.325 | 52 -
7.2.326 | 54 -
7.2.327 | 323 -
7.2.328 | 52 -
7.2.329 | 48 -
7.2.330 | 1531 -----
7.2.331 | 47 -
7.2.332 | 101 -
7.2.333 | 371 --
7.2.334 | 347 --
7.2.335 | 103 -
7.2.336 | 841 ---
7.2.337 | 112 -
7.2.338 | 129 -
7.2.339 | 78 -
7.2.340 | 54 -
7.2.341 | 69 -
7.2.342 | 95 -
7.2.343 | 51 -
7.2.344 | 60 -
7.2.345 | 47 -
7.2.346 | 110 -
7.2.347 | 138 -
7.2.348 | 254 -
7.2.349 | 53 -
7.2.350 | 86 -
7.2.351 | 78 -
7.2.352 | 62 -
7.2.353 | 173 -
7.2.354 | 78 -
7.2.355 | 88 -
7.2.356 | 69 -
7.2.357 | 49 -
7.2.358 | 78 -
7.2.359 | 68 -
7.2.360 | 96 -
7.2.361 | 763 ---
7.2.362 | 95 -
7.2.363 | 70 -
7.2.364 | 91 -
7.2.365 | 71 -
7.2.366 | 134 -
7.2.367 | 77 -
7.2.368 | 52 -
7.2.369 | 55 -
7.2.370 | 156 -
7.2.371 | 322 -
7.2.372 | 303 -
7.2.373 | 54 -
7.2.374 | 168 -
7.2.375 | 64 -
7.2.376 | 50 -
7.2.377 | 66 -
7.2.378 | 69 -
7.2.379 | 55 -
7.2.380 | 104 -
7.2.381 | 218 -
7.2.382 | 58 -
7.2.383 | 101 -
7.2.384 | 59 -
7.2.385 | 63 -
7.2.386 | 61 -
7.2.387 | 238 -
7.2.388 | 86 -
7.2.389 | 161 -
7.2.390 | 72 -
7.2.391 | 121 -
7.2.392 | 184 -
7.2.393 | 281 -
7.2.394 | 99 -
7.2.395 | 60 -
7.2.396 | 51 -
7.2.397 | 67 -
7.2.398 | 152 -
7.2.399 | 63 -
7.2.400 | 454 --
7.2.401 | 61 -
7.2.402 | 91 -
7.2.403 | 53 -
7.2.404 | 54 -
7.2.405 | 48 -
7.2.406 | 123 -
7.2.407 | 69 -
7.2.408 | 73 -
7.2.409 | 60 -
7.2.410 | 78 -
7.2.411 | 47 -
7.2.412 | 85 -
7.2.413 | 452 --
7.2.414 | 93 -
7.2.415 | 69 -
7.2.416 | 69 -
7.2.417 | 72 -
7.2.418 | 113 -
7.2.419 | 46 -
7.2.420 | 70 -
7.2.421 | 68 -
7.2.422 | 67 -
7.2.423 | 150 -
7.2.424 | 162 -
7.2.425 | 52 -
7.2.426 | 136 -
7.2.427 | 207 -
7.2.428 | 55 -
7.2.429 | 69 -
7.2.430 | 133 -
7.2.431 | 100 -
7.2.432 | 499 --
7.2.433 | 208 -
7.2.434 | 75 -
7.2.435 | 144 -
7.2.436 | 107 -
7.2.437 | 53 -
7.2.438 | 74 -
7.2.439 | 111 -
7.2.440 | 180 -
7.2.441 | 141 -
7.2.442 | 256 -
7.2.443 | 116 -
7.2.444 | 85 -
7.2.445 | 261 -
7.2.446 | 91 -
7.3.001 | 55 +
7.3.002 | 55 +
7.3.003 | 45 +
7.3.004 | 44 +
7.3.005 | 96 +
7.3.006 | 117 +
7.3.007 | 187 +
7.3.008 | 439 ++
7.3.009 | 99 +
7.3.010 | 167 +
7.3.011 | 290 +
7.3.012 | 71 +
7.3.013 | 208 +
7.3.014 | 87 +
7.3.015 | 68 +
7.3.016 | 240 +
7.3.017 | 124 +
7.3.018 | 74 +
7.3.019 | 55 +
7.3.020 | 131 +
7.3.021 | 70 +
7.3.022 | 54 +
7.3.023 | 69 +
7.3.024 | 115 +
7.3.025 | 136 +
7.3.026 | 61 +
7.3.027 | 88 +
7.3.028 | 179 +
7.3.029 | 177 +
7.3.030 | 366 ++
7.3.031 | 121 +
7.3.032 | 704 +++
7.3.033 | 49 +
7.3.034 | 431 ++
7.3.035 | 58 +
7.3.036 | 68 +
7.3.037 | 137 +
7.3.038 | 76 +
7.3.039 | 90 +
7.3.040 | 48 +
7.3.041 | 57 +
7.3.042 | 65 +
7.3.043 | 460 ++
7.3.044 | 58 +
7.3.045 | 57 +
7.3.046 | 76 +
7.3.047 | 172 +
7.3.048 | 109 +
7.3.049 | 495 ++
7.3.050 | 199 +
7.3.051 | 111 +
7.3.052 | 345 ++
7.3.053 | 89 +
7.3.054 | 112 +
7.3.055 | 359 ++
7.3.056 | 542 ++
README.patches | 516 +--
sources | 4 +-
vim-7.0-syntax.patch | 11 -
...-fstabsyntax.patch => vim-7.3-fstabsyntax.patch | 12 +-
vim-7.3-syntax.patch | 12 +
vim-update.sh | 45 +-
vim.spec | 1039 +---
510 files changed, 9334 insertions(+), 88876 deletions(-)
---
More information about the scm-commits
mailing list