?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: b367e5d 45eb4dd)
Merge remote branch 'origin/demonstration'master
commite3ef3550229d884f6e6b274391577f8f9cb3712f
authorJan Kundrát <kundratj@fzu.cz>
Mon, 16 Jan 2012 10:29:22 +0000 (16 11:29 +0100)
committerJan Kundrát <kundratj@fzu.cz>
Mon, 16 Jan 2012 10:29:22 +0000 (16 11:29 +0100)
tree2458bbfb3f886bdd22d0fcbfa65f06d34a49a2f5tree | snapshot (tar.gz zip)
parentb367e5d0e4557b4f90c6d6ccd0eaff24ce2f5d5fcommit | diff
parent45eb4dd73385e5d9dc63b664eb2082a0adfe624ccommit | diff
Merge remote branch 'origin/demonstration'

Conflicts:
src/deska/cli/CliCommands_DiffRebase.cpp
src/deska/cli/UserInterface.cpp
Tool for an Administration of a Grid Site