commit 9c8cd0c258f44df40d9d2c9be0cb340ab36fcab4 Merge: 67b5d65 bdcc620 Author: Daiki Ueno ueno@unixuser.org Date: Thu May 26 10:31:43 2011 +0900
Merge branch 'master' into f15
Conflicts: .gitignore eekboard.spec
.gitignore | 1 + eekboard.spec | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) ---