[haiku-commits] BRANCH axeld-github.imap - data/system/data src/libs/freetype2 src/add-ons/kernel/bus_managers/acpi/acpica src/add-ons/kernel/bus_managers/acpi src/add-ons/kernel

  • From: axeld-github.imap <community@xxxxxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 2 Aug 2012 21:49:26 +0200 (CEST)

added 1 changeset to branch 'refs/remotes/axeld-github/imap'
old head: a767d7814da22fb4d180ac746840ee827b6adfb2
new head: e229f93f28938051efce1e950952cea15d9f6d30

----------------------------------------------------------------------------

e229f93: Merge branch 'github-master' into imap
  
  Conflicts:
        src/add-ons/mail_daemon/inbound_protocols/imap/FolderConfigWindow.cpp
        src/kits/mail/ServerConnection.cpp

                                   [ Axel Dörfler <axeld@xxxxxxxxxxxxxxxx> ]

----------------------------------------------------------------------------

Commit:      e229f93f28938051efce1e950952cea15d9f6d30

Author:      Axel Dörfler <axeld@xxxxxxxxxxxxxxxx>
Date:        Thu Aug  2 19:08:09 2012 UTC

----------------------------------------------------------------------------



----------------------------------------------------------------------------


Other related posts:

  • » [haiku-commits] BRANCH axeld-github.imap - data/system/data src/libs/freetype2 src/add-ons/kernel/bus_managers/acpi/acpica src/add-ons/kernel/bus_managers/acpi src/add-ons/kernel - axeld-github . imap