[memprof: 69/76] Merge remote branch 'gnome/master'



commit e3894e3d75bc0f4c21bd9ecf10910e0fa2a29d98
Merge: 0ddbd80 04380c8
Author: Holger Hans Peter Freyther <zecke selfish org>
Date:   Mon Mar 29 07:33:01 2010 +0200

    Merge remote branch 'gnome/master'
    
    Conflicts:
    	po/cs.po

 po/cs.po |  227 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 113 insertions(+), 114 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]