commit 9b9a6bf355023dbc6f72be85103fc2c16d8f2fc0
Merge: 324f874 affd9d2
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Thu Oct 13 16:39:20 2011 +0100
fix merge
.gitignore | 4 +--
meego-panel-myzone.spec | 62 +++++++++++++++++++++++-----------------------
sources | 2 +-
3 files changed, 33 insertions(+), 35 deletions(-)
---