From c6f88a48ccc13940e2b2a433f2976dd35e0d8f9e Mon Sep 17 00:00:00 2001
From: zecke <zecke>
Date: Tue, 10 Jun 2003 17:49:00 +0000
Subject: cvs is so crappy in not moving the branch point after a merge with HEAD that later merges ends up in tons of conflicts or cvs strikes... so remove and add it again.. yuppie

---
(limited to 'core/obex/obex.h')

--
cgit v0.9.0.2