From: <oma...@us...> - 2009-11-13 15:44:58
|
Revision: 769 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=769&view=rev Author: omalleypat Date: 2009-11-13 15:44:49 +0000 (Fri, 13 Nov 2009) Log Message: ----------- Merge changes to budgetingpanel from 0.9.5 svn merge -x -w -x --ignore-eol-style -r 407:HEAD ^/tags/releases/0.9.5.1/src/budgetingpanel.cpp ./src/budgetingpanel.cpp svn merge -x -w -x --ignore-eol-style -r 407:HEAD ^/tags/releases/0.9.5.1/include/budgetingpanel.h ./src/budgetingpanel.h Changes to sql syntax in trunk causing conflict were kept. Property Changed: ---------------- trunk/mmex/src/budgetingpanel.cpp trunk/mmex/src/budgetingpanel.h Property changes on: trunk/mmex/src/budgetingpanel.cpp ___________________________________________________________________ Added: svn:mergeinfo + /branches/0.9.5/mmex/src/budgetingpanel.cpp:408-735 /tags/releases/0.9.5.1/src/budgetingpanel.cpp:736-768 Property changes on: trunk/mmex/src/budgetingpanel.h ___________________________________________________________________ Added: svn:mergeinfo + /branches/0.9.5/mmex/include/budgetingpanel.h:408-735 /branches/0.9.5/mmex/src/budgetingpanel.h:566 /tags/releases/0.9.5.1/include/budgetingpanel.h:736-768 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |