[Dcplusplus-commit] SF.net SVN: dcplusplus: [1085] dcplusplus/trunk

[<arn...@us...>]

Revision: 1085
          http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1085&view=rev
Author:   arnetheduck
Date:     2008-03-29 01:10:38 -0700 (Sat, 29 Mar 2008)

Log Message:
-----------
conflict leftover

Modified Paths:
--------------
    dcplusplus/trunk/smartwin/include/smartwin/widgets/LoadDialog.h

Property Changed:
----------------
    dcplusplus/trunk/


Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2008-03-29 06:56:30.651999950 +0100
committer: Jacek Sieka <arn...@gm...>
properties: 
	branch-nick: dcplusplus

   + timestamp: 2008-03-29 07:15:58.839999914 +0100
committer: Jacek Sieka <arn...@gm...>
properties: 
	branch-nick: dcplusplus

Name: bzr:file-ids
   - smartwin/include/smartwin/widgets/LoadDialog.h	712@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Finclude%2Fsmartwin%2Fwidgets%2FWidgetLoadFile.h
smartwin/include/smartwin/widgets/SaveDialog.h	712@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:smartwin%2Finclude%2Fsmartwin%2Fwidgets%2FWidgetSaveFile.h
win32/ComboBox.cpp	1023@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:win32%2FWidgetComboBox.cpp
win32/ComboBox.h	1023@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:win32%2FWidgetComboBox.h
win32/TextBox.cpp	1023@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:win32%2FWidgetTextBox.cpp
win32/TextBox.h	753@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:win32%2FWidgetTextBox.h
win32/TypedTable.h	846@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:win32%2FTypedListView.h
win32/TypedTree.h	743@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:win32%2FTypedTreeView.h

   + 
Name: bzr:revision-id:v3-trunk1
   - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn
1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn
1029 zouzou123gen-20080323221249-0su72zaj13e706mk
1030 arn...@gm...-20080324140623-muba1dl46m000o8c
1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6
1032 arn...@gm...-20080324153706-siidja05n84i00b1
1033 arn...@gm...-20080324153823-lhn3awurnu77riln
1034 arn...@gm...-20080324165650-zapppziji67yf5a2
1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2
1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3
1037 arn...@gm...-20080325100659-8fqy6q65itmghlep
1038 zouzou123gen-20080325175216-s297sdiucukfvijh
1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087
1040 arn...@gm...-20080325211747-nwwy1eb33r071sca
1041 arn...@gm...-20080326084110-qbselrjckku275xi
1042 zouzou123gen-20080326123631-35642mgbk2i4ty32
1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r
1044 arn...@gm...-20080326162031-il0nyms30w0mky43
1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv
1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g
1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv
1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q
1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz
1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf
1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd
1052 arn...@gm...-20080327120639-um3tukdt374rwvgm
1053 zouzou123gen-20080327130703-6vtek6uxy3vua543
1054 arn...@gm...-20080327215831-dmg5mkufskabwkro
1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf
1056 arn...@gm...-20080328085925-gceybsr53oml1p24
1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a
1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o
1059 arn...@gm...-20080329055630-braiir1dskv7a4qm

   + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn
1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn
1029 zouzou123gen-20080323221249-0su72zaj13e706mk
1030 arn...@gm...-20080324140623-muba1dl46m000o8c
1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6
1032 arn...@gm...-20080324153706-siidja05n84i00b1
1033 arn...@gm...-20080324153823-lhn3awurnu77riln
1034 arn...@gm...-20080324165650-zapppziji67yf5a2
1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2
1036 zouzou123gen-20080325004602-6wdsoym95mjuhwd3
1037 arn...@gm...-20080325100659-8fqy6q65itmghlep
1038 zouzou123gen-20080325175216-s297sdiucukfvijh
1039 arn...@gm...-20080325210137-3dfqyoi8ykosy087
1040 arn...@gm...-20080325211747-nwwy1eb33r071sca
1041 arn...@gm...-20080326084110-qbselrjckku275xi
1042 zouzou123gen-20080326123631-35642mgbk2i4ty32
1043 zouzou123gen-20080326124345-f4xwn2d3ty8ubd6r
1044 arn...@gm...-20080326162031-il0nyms30w0mky43
1045 arn...@gm...-20080326164801-8dru8mjc06xgzjpv
1046 arn...@gm...-20080326170438-uzl2rx8fqnohak7g
1047 zouzou123gen-20080326172821-d6uqcbmfb0c6rwlv
1048 arn...@gm...-20080326213257-qlgdh7m2712p2l0q
1049 arn...@gm...-20080326214313-ktnoekgk3s0wmatz
1050 arn...@gm...-20080326215256-0j1iqrf286b9g7zf
1051 arn...@gm...-20080327082121-hoi22wh1gwjdfbyd
1052 arn...@gm...-20080327120639-um3tukdt374rwvgm
1053 zouzou123gen-20080327130703-6vtek6uxy3vua543
1054 arn...@gm...-20080327215831-dmg5mkufskabwkro
1055 arn...@gm...-20080327231459-cdztcv25alsuyqmf
1056 arn...@gm...-20080328085925-gceybsr53oml1p24
1057 arn...@gm...-20080328200512-1sjuu6bcnl2dyd2a
1058 arn...@gm...-20080328210347-bussqjrm5mfswh7o
1059 arn...@gm...-20080329055630-braiir1dskv7a4qm
1060 arn...@gm...-20080329061558-rck8dz60wpj3c5ja


Modified: dcplusplus/trunk/smartwin/include/smartwin/widgets/LoadDialog.h
===================================================================
--- dcplusplus/trunk/smartwin/include/smartwin/widgets/LoadDialog.h	2008-03-29 08:10:17 UTC (rev 1084)
+++ dcplusplus/trunk/smartwin/include/smartwin/widgets/LoadDialog.h	2008-03-29 08:10:38 UTC (rev 1085)
@@ -79,15 +79,7 @@
 	// Constructor Taking pointer to parent
 	explicit LoadDialog( Widget * parent = 0 );
 
-<<<<<<< TREE
-<<<<<<< TREE
 	~LoadDialog() { }
-=======
-	virtual ~WidgetLoadFile() { }
->>>>>>> MERGE-SOURCE
-=======
-	virtual ~LoadDialog() { }
->>>>>>> MERGE-SOURCE
 private:
 };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.