merge of '2beb673f2d4abc8e4ea6eb827ec51bd6371423b6'

and '3aef78f323b46f1ff836bf4757a34f80ffd3d160'

Monotone-Parent: 2beb673f2d4abc8e4ea6eb827ec51bd6371423b6
Monotone-Parent: 3aef78f323b46f1ff836bf4757a34f80ffd3d160
Monotone-Revision: d925078e57868fc910aed3a8f4d3ae25d8eaffd3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-09-16T13:18:09
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2010-09-16 13:18:09 +00:00
commit 1c29ec736e
2 changed files with 2 additions and 2 deletions

View file

@ -22,7 +22,7 @@
#ifndef __Mailer_SOGoMailFolder_H__
#define __Mailer_SOGoMailFolder_H__
#include <SoObjects/Mailer/SOGoMailBaseObject.h>
#include <Mailer/SOGoMailBaseObject.h>
#import <Foundation/NSRange.h>
#import <NGObjWeb/WOResponse.h>

View file

@ -22,7 +22,7 @@
#ifndef __Mailer_SOGoMailObject_H__
#define __Mailer_SOGoMailObject_H__
#import <SoObjects/Mailer/SOGoMailBaseObject.h>
#import <Mailer/SOGoMailBaseObject.h>
/*
SOGoMailObject