[go: up one dir, main page]
Menu ▾ ▴

Commit [r449]  Maximize  Restore  History

Merge 2.1 into trunk

steve_lamerton 2009-03-16

Browse code at this revision

Parent: [r448]

Child: [r450]

1 2 3 4 > >> (Page 1 of 4)
copied /toucan/branches/2.1/controls -> /toucan/trunk/controls
copied /toucan/branches/2.1/controls/extendeddirctrl.cpp -> /toucan/trunk/controls/extendeddirctrl.cpp
copied /toucan/branches/2.1/controls/extendeddirctrl.h -> /toucan/trunk/controls/extendeddirctrl.h
copied /toucan/branches/2.1/controls/loglistctrl.cpp -> /toucan/trunk/controls/loglistctrl.cpp
copied /toucan/branches/2.1/controls/loglistctrl.h -> /toucan/trunk/controls/loglistctrl.h
copied /toucan/branches/2.1/controls/virtualdirtreectrl.cpp -> /toucan/trunk/controls/virtualdirtreectrl.cpp
copied /toucan/branches/2.1/controls/virtualdirtreectrl.h -> /toucan/trunk/controls/virtualdirtreectrl.h
copied /toucan/branches/2.1/data -> /toucan/trunk/data
copied /toucan/branches/2.1/data/backupdata.cpp -> /toucan/trunk/data/backupdata.cpp
copied /toucan/branches/2.1/data/backupdata.h -> /toucan/trunk/data/backupdata.h
copied /toucan/branches/2.1/data/rootdata.cpp -> /toucan/trunk/data/rootdata.cpp
copied /toucan/branches/2.1/data/rootdata.h -> /toucan/trunk/data/rootdata.h
copied /toucan/branches/2.1/data/securedata.cpp -> /toucan/trunk/data/securedata.cpp
copied /toucan/branches/2.1/data/securedata.h -> /toucan/trunk/data/securedata.h
removed /toucan/trunk/backupdata.cpp
removed /toucan/trunk/backupdata.h
changed /toucan/trunk/backupprocess.cpp
changed /toucan/trunk/backupprocess.h
changed /toucan/trunk/basicfunctions.cpp
changed /toucan/trunk/basicfunctions.h
changed /toucan/trunk/cmdline.cpp
copied /toucan/trunk/default.po -> /toucan/trunk/default.po
changed /toucan/trunk/dragndrop.cpp
changed /toucan/trunk/dragndrop.h
removed /toucan/trunk/extendeddirctrl.cpp
/toucan/branches/2.1/controls to /toucan/trunk/controls
File was copied.
/toucan/branches/2.1/controls/extendeddirctrl.cpp to /toucan/trunk/controls/extendeddirctrl.cpp
File was copied.
/toucan/branches/2.1/controls/extendeddirctrl.h to /toucan/trunk/controls/extendeddirctrl.h
File was copied.
/toucan/branches/2.1/controls/loglistctrl.cpp to /toucan/trunk/controls/loglistctrl.cpp
File was copied.
/toucan/branches/2.1/controls/loglistctrl.h to /toucan/trunk/controls/loglistctrl.h
File was copied.
/toucan/branches/2.1/controls/virtualdirtreectrl.cpp to /toucan/trunk/controls/virtualdirtreectrl.cpp
File was copied.
/toucan/branches/2.1/controls/virtualdirtreectrl.h to /toucan/trunk/controls/virtualdirtreectrl.h
File was copied.
/toucan/branches/2.1/data to /toucan/trunk/data
File was copied.
/toucan/branches/2.1/data/backupdata.cpp to /toucan/trunk/data/backupdata.cpp
File was copied.
/toucan/branches/2.1/data/backupdata.h to /toucan/trunk/data/backupdata.h
File was copied.
/toucan/branches/2.1/data/rootdata.cpp to /toucan/trunk/data/rootdata.cpp
File was copied.
/toucan/branches/2.1/data/rootdata.h to /toucan/trunk/data/rootdata.h
File was copied.
/toucan/branches/2.1/data/securedata.cpp to /toucan/trunk/data/securedata.cpp
File was copied.
/toucan/branches/2.1/data/securedata.h to /toucan/trunk/data/securedata.h
File was copied.
/toucan/trunk/backupdata.cpp
File was removed.
/toucan/trunk/backupdata.h
File was removed.
/toucan/trunk/backupprocess.cpp Diff Switch to side-by-side view
Loading...
/toucan/trunk/backupprocess.h Diff Switch to side-by-side view
Loading...
/toucan/trunk/basicfunctions.cpp Diff Switch to side-by-side view
Loading...
/toucan/trunk/basicfunctions.h Diff Switch to side-by-side view
Loading...
/toucan/trunk/cmdline.cpp Diff Switch to side-by-side view
Loading...
/toucan/trunk/default.po to /toucan/trunk/default.po
File was copied.
/toucan/trunk/dragndrop.cpp Diff Switch to side-by-side view
Loading...
/toucan/trunk/dragndrop.h Diff Switch to side-by-side view
Loading...
/toucan/trunk/extendeddirctrl.cpp
File was removed.
1 2 3 4 > >> (Page 1 of 4)