From: asterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Fri, 30 Jul 2010 12:21:30 +0000 (+0000)
Subject: Fix svnmerge-integrated property.
X-Git-Tag: 2.6.0~290
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;ds=sidebyside;h=4c2b4f57f6a832c280f1d1841e04b1fa289b0f69;p=bertos.git

Fix svnmerge-integrated property.

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