comparison COPYRIGHT @ 20685:02df6998b466

propagate from branch 'im.pidgin.rlaager.merging.2_2_1_conflicts' (head 4ad1081695d083df424898e6e7091f731b401265) to branch 'im.pidgin.pidgin' (head d33243e8f5347776c81f81a0e4ba3a76ae5505a5)
author Richard Laager <rlaager@wiktel.com>
date Fri, 28 Sep 2007 16:34:43 +0000
parents 5a352cb00fc3 0584c704cc4a
children 27ab73f69275 680e1319b464 975691a8d718
comparison
equal deleted inserted replaced
20258:509ca8ebe515 20685:02df6998b466
244 Lars T. Mikkelsen 244 Lars T. Mikkelsen
245 Benjamin Miller 245 Benjamin Miller
246 Kevin Miller 246 Kevin Miller
247 Paul Miller 247 Paul Miller
248 Arkadiusz Miskiewicz 248 Arkadiusz Miskiewicz
249 David Mohr
249 Andrew Molloy 250 Andrew Molloy
250 Michael Monreal 251 Michael Monreal
251 Benjamin Moody 252 Benjamin Moody
252 John Moody 253 John Moody
253 Tim Mooney 254 Tim Mooney
276 Havoc Pennington 277 Havoc Pennington
277 Ted Percival 278 Ted Percival
278 Eduardo Pérez 279 Eduardo Pérez
279 Matt Perry 280 Matt Perry
280 Nathan Peterson 281 Nathan Peterson
282 Sebastián E. Peyrott
281 Celso Pinto 283 Celso Pinto
282 Joao Luís Marques Pinto 284 Joao Luís Marques Pinto
283 Aleksander Piotrowski 285 Aleksander Piotrowski
284 Julien Pivotto 286 Julien Pivotto
285 Eric Polino <aluink@gmail.com> 287 Eric Polino <aluink@gmail.com>