The branch, build-main has been updated via 6199b60e71cd957a7bf49fbfde82f0bb399d0138 (commit) from d38f6b8b69ee54e504446d8dd63bf78a1439a284 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 --- 1 file changed, 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fb95147..9f0d4e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,3 @@ - -- Reinhard Tartler <siretart@tauware.de> Thu, 20 Dec 2012 10:15:26 +0100 - ->>>>>>> d7f1087... Introduce /etc/x2go/nxagent.options to allow overriding nxagent options x2goserver (3.1.1.10-0~x2go1) UNRELEASED; urgency=low [ Jan Engelhardt ] hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).