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

List:       kde-commits
Subject:    [okular/KDE/4.12] /: Merge remote-tracking branch 'origin/KDE/4.11' into KDE/4.12
From:       Albert Astals Cid <aacid () kde ! org>
Date:       2013-11-23 16:55:07
Message-ID: E1VkGU7-0002if-SK () scm ! kde ! org
[Download RAW message or body]

Git commit ec814654bc5f2daf4a5f4783e12cfd382d17a1a8 by Albert Astals Cid.
Committed on 23/11/2013 at 16:55.
Pushed by aacid into branch 'KDE/4.12'.

Merge remote-tracking branch 'origin/KDE/4.11' into KDE/4.12

Conflicts:
	VERSION
	core/version.h


http://commits.kde.org/okular/ec814654bc5f2daf4a5f4783e12cfd382d17a1a8
[prev in list] [next in list] [prev in thread] [next in thread]