svn commit: r1556864 - /incubator/celix/trunk/framework/private/src/properties.c

[pnoltes]

Author: pnoltes
Date: Thu Jan  9 16:37:38 2014
New Revision: 1556864

URL: http://svn.apache.org/r1556864
Log:
Merge branch 'properties'

Conflicts:
        framework/private/src/properties.c

Modified:
    incubator/celix/trunk/framework/private/src/properties.c

Modified: incubator/celix/trunk/framework/private/src/properties.c
URL: 
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/properties.c?rev=1556864&r1=1556863&r2=1556864&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/properties.c (original)
+++ incubator/celix/trunk/framework/private/src/properties.c Thu Jan  9 
16:37:38 2014
@@ -124,7 +124,7 @@ properties_pt properties_load(char *file
                        }
 
                        if (!isComment) {
-                               printf("putting 'key'/'value' '%s'/'%s' in 
properties\n", utils_stringTrim(key), utils_stringTrim(value));
+                               //printf("putting 'key'/'value' '%s'/'%s' in 
properties\n", utils_stringTrim(key), utils_stringTrim(value));
                                hashMap_put(props, 
strdup(utils_stringTrim(key)), strdup(utils_stringTrim(value)));
                        }
                }