diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-05-09 11:05:05 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-05-09 11:05:05 +0200 |
| commit | 4b36d7578819ade6986f7c85cbbeb20265d6bce8 (patch) | |
| tree | 36f7057aa6ef343d51f82db9d1889146e6849a93 /NEWS | |
| parent | 89b8c2937e5dabde31a4a75c9200767954553b68 (diff) | |
| parent | aebb7bf381694c3b72e456c2c1d19c0853d18836 (diff) | |
Merge branch 'gnome-3-0'
Conflicts:
gck/Makefile.am
gcr/Makefile.am
Diffstat (limited to 'NEWS')
0 files changed, 0 insertions, 0 deletions