The branch, release/4.0.0.x has been updated via 9c27bc31fbcb612fa9600a051bc2eddc9bd22b02 (commit) from e99abc4dd01b88d397b466e64a70aaa46200243c (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 ----------------------------------------------------------------- commit 9c27bc31fbcb612fa9600a051bc2eddc9bd22b02 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Feb 12 19:28:57 2013 +0100 fix changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 13 ------------- 1 file changed, 13 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2a2f9ed..26b73a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,3 @@ -<<<<<<< HEAD -======= -x2goclient (4.0.1.0-0~x2go1) UNRELEASED; urgency=low - - [ Mike Gabriel ] - * Continue new feature development... - - [ Oleksandr Shneyder ] - * Terminating nxproxy from X2Go Client if connection to server lost. (Fixes: #100) - - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 30 Dec 2012 15:41:04 +0100 - ->>>>>>> b944cf8... fixing building x2goplugin x2goclient (4.0.0.2-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).