Revision f036f6ba
ID | f036f6ba703ef61ae305dc7ba19e5830211d952a |
Merge branch 'Polling' of https://code.grnet.gr/git/pithos-ms-client into Polling
Conflicts:
trunk/Pithos.Core/Agents/StatusAgent.cs
Files
- added
- modified
- copied
- renamed
- deleted
ID | f036f6ba703ef61ae305dc7ba19e5830211d952a |
Added by Panagiotis Kanavos about 12 years ago
Merge branch 'Polling' of https://code.grnet.gr/git/pithos-ms-client into Polling
Conflicts:
trunk/Pithos.Core/Agents/StatusAgent.cs