From b862065c044d15dc0f69e907a812b165f720d0e0 Mon Sep 17 00:00:00 2001 From: Olivier Ligot Date: Mon, 26 Mar 2012 17:19:02 +0200 Subject: [PATCH 1/3] Merge branch 'master', remote branch 'upstream/master' From 0040e4b0d019dc2f4b4fed9cf2c9c74971c29d89 Mon Sep 17 00:00:00 2001 From: Olivier Ligot Date: Tue, 27 Mar 2012 11:29:33 +0200 Subject: [PATCH 2/3] [IMP] Ignore *.swp files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d83558cf..b9eb7ce4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ EIFGENs tests/temp/ .svn/ +*.swp From 425c2760514352809ef0b200c0fe3592f6c1148a Mon Sep 17 00:00:00 2001 From: Olivier Ligot Date: Tue, 27 Mar 2012 11:30:42 +0200 Subject: [PATCH 3/3] [REM] Remove unneeded precondition --- library/server/wsf/src/service/wsf_service_launcher.e | 2 -- 1 file changed, 2 deletions(-) diff --git a/library/server/wsf/src/service/wsf_service_launcher.e b/library/server/wsf/src/service/wsf_service_launcher.e index 90e2b9db..6499ae9a 100644 --- a/library/server/wsf/src/service/wsf_service_launcher.e +++ b/library/server/wsf/src/service/wsf_service_launcher.e @@ -51,8 +51,6 @@ feature {NONE} -- Initialization end frozen make_and_launch (a_service: like service; a_options: like options) - require - a_options_attached: a_options /= Void do make (a_service, a_options) launch