[glom/maemo5] (5 commits) ...Fix merge conflicts from master.

From: Murray Cumming <murrayc src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [glom/maemo5] (5 commits) ...Fix merge conflicts from master.
Date: Fri, 16 Oct 2009 09:40:53 +0000 (UTC)

Summary of changes:

  e38fcaa... Maemo: Allow Relationships to have singular titles too. Use (*)
  cd16aae... Remove unwanted merge change. (*)
  f4881b9... Fixed main build after merging from the maemo5 branch. (*)
  ac0a090... * glom/libglom/document/document.cc: load_after(), save_bef (*)
  daecb80... Fix merge conflicts from master.

(*) This commit already existed in another branch; no separate mail sent

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]