You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@celix.apache.org by pn...@apache.org on 2014/01/14 09:59:45 UTC

svn propchange: r1556864 - svn:log

Author: pnoltes
Revision: 1556864
Modified property: svn:log

Modified: svn:log at Tue Jan 14 08:59:45 2014
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Tue Jan 14 08:59:45 2014
@@ -1,4 +1 @@
-Merge branch 'properties'
-
-Conflicts:
-	framework/private/src/properties.c
+CELIX-94: updated properties for additional escape characters