]> git.sur5r.net Git - bacula/bacula/commit
projects / bacula / bacula / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: af22839) | patch
The result of the following merge: This merges the work in the branch into the head.
authorDirk H Bartley <dbartley@schupan.com>
Wed, 25 Jul 2007 02:32:37 +0000 (02:32 +0000)
committerDirk H Bartley <dbartley@schupan.com>
Wed, 25 Jul 2007 02:32:37 +0000 (02:32 +0000)
commitc17609599bdad4b11413c7c4be0dff7838ea4c5c
treec17a0ab2cc7d620b5cd1d67693e1712181955a66tree | snapshot
parentaf228399838423e650ead4aad551a8627ffaf058commit | diff
The result of the following merge:  This merges the work in the branch into the head.
This does not quite work yet, working with kern on getting changes in the server!
svn merge -r5136:5238 https://bacula.svn.sourceforge.net/svnroot/bacula/branches/working/qt-console .

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5239 91ce42f0-d328-0410-95d8-f526ca767f89
13 files changed:
bacula/src/qt-console/images/folderbothchecked.png [new file with mode: 0644] blob
bacula/src/qt-console/images/folderbothchecked.svg [new file with mode: 0644] blob
bacula/src/qt-console/images/folderchecked.png [new file with mode: 0644] blob
bacula/src/qt-console/images/folderchecked.svg [new file with mode: 0644] blob
bacula/src/qt-console/images/folderunchecked.png [new file with mode: 0644] blob
bacula/src/qt-console/images/folderunchecked.svg [new file with mode: 0644] blob
bacula/src/qt-console/main.qrc diff | blob | history
bacula/src/qt-console/mainwin.cpp diff | blob | history
bacula/src/qt-console/mainwin.h diff | blob | history
bacula/src/qt-console/prefs.ui diff | blob | history
bacula/src/qt-console/restore/restoretree.cpp diff | blob | history
bacula/src/qt-console/restore/restoretree.h diff | blob | history
bacula/src/qt-console/restore/restoretree.ui diff | blob | history
Cloned from http://git.bacula.org/bacula