From: lmancini <lmancini@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Fri, 30 Jul 2010 10:58:16 +0000 (+0000)
Subject: Fix svnmerge-integrated property
X-Git-Tag: 2.6.0~291
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=57a216e943967bf2acb3acffa30ee8bdfc079dd9;p=bertos.git

Fix svnmerge-integrated property



git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4098 38d2e660-2303-0410-9eaa-f027e97ec537
---