[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra] words/part: Merge branch 'master' of git://anongit.kde.org/calligra
From:       Andrius da Costa Ribas <andriusmao () gmail ! com>
Date:       2013-11-30 19:14:37
Message-ID: E1Vmpzx-0002Dv-07 () scm ! kde ! org
[Download RAW message or body]

Git commit 59dc682944e55a8318f5023c5096a67ef9423cb7 by Andrius da Costa Rib=
as.
Committed on 30/11/2013 at 19:01.
Pushed by andriusr into branch 'master'.

Merge branch 'master' of git://anongit.kde.org/calligra

Conflicts:
	words/part/KWView.cpp
	words/part/KWView.h

M  +38   -7    words/part/KWView.cpp
M  +3    -1    words/part/KWView.h

http://commits.kde.org/calligra/59dc682944e55a8318f5023c5096a67ef9423cb7


[prev in list] [next in list] [prev in thread] [next in thread]