Merge commit 'refs/merge-requests/1' of gitorious.org:meego-cellular/ofono-qt into...
authorAlexander Kanavin <alexander.kanavin@nokia.com>
Tue, 19 Apr 2011 12:20:51 +0000 (15:20 +0300)
committerAlexander Kanavin <alexander.kanavin@nokia.com>
Tue, 19 Apr 2011 12:20:51 +0000 (15:20 +0300)
1  2 
lib/ofonosimmanager.h

Simple merge