[tomboy/docs: 6/6] Merge branch 'master' into docs
- From: Sanford Armstrong <sharm src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tomboy/docs: 6/6] Merge branch 'master' into docs
- Date: Mon, 25 Jan 2010 21:46:13 +0000 (UTC)
commit d1e8f5e96a000890f27b2b90526106d77a1db23c
Merge: f6a8dc3 57ac1ab
Author: Sandy Armstrong <sanfordarmstrong gmail com>
Date: Mon Jan 25 13:46:01 2010 -0800
Merge branch 'master' into docs
NEWS | 10 ++
Setup/Setup.wxs | 2 +-
.../FileSystemSyncServiceAddin.cs | 48 ++------
Tomboy/Defines.WIN32.cs | 4 +-
Tomboy/Makefile.am | 1 +
Tomboy/NoteBuffer.cs | 52 ++++++++
Tomboy/Tomboy.cs | 1 +
configure.in | 2 +-
data/Makefile.am | 1 +
data/tomboy-note-clipboard-html.xsl | 127 ++++++++++++++++++++
osx/Contents/Info.plist | 4 +-
11 files changed, 207 insertions(+), 45 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]