Merged branches from BRANCH_1_0

3 files changed, 5 insertions, 0 deletions

diff --git a/library/backend/vcc.y b/library/backend/vcc.y
index 94a8fea..4c79368 100644
--- a/library/backend/vcc.y
+++ b/library/backend/vcc.y
@@ -1035,4 +1035,6 @@ static int yylex() {
                 p = lexGetDataFromBase64();

+        #if 0   
                 yylval.str = p;

                 return STRING;

+        #endif  
                 }

diff --git a/library/backend/vcc_yacc.cpp b/library/backend/vcc_yacc.cpp
index 5649522..5f53aef 100644
--- a/library/backend/vcc_yacc.cpp
+++ b/library/backend/vcc_yacc.cpp
@@ -1055,4 +1055,6 @@ static int yylex() {
                 p = lexGetDataFromBase64();

+#if 0
                 yylval.str = p;

                 return STRING;

+        #endif  
                 }

diff --git a/library/backend/vobject.cpp b/library/backend/vobject.cpp
index b6d17dc..4c8de70 100644
--- a/library/backend/vobject.cpp
+++ b/library/backend/vobject.cpp
@@ -759,2 +759,3 @@ static struct PreDefProp propNames[] = {
     { VCQPProp, VCQuotedPrintableProp, 0, 0 },
+    { VCQPProp, VCBase64Prop, 0, 0 },
     { VCQuickTimeProp, 0, 0, 0 },