From 90ad8248d73a89266a4a78a12428e59d7b1067ea Mon Sep 17 00:00:00 2001 From: "Julian K. Arni" Date: Mon, 20 Apr 2015 11:21:21 +0200 Subject: [PATCH] prepare merge --- CHANGELOG.md => servant/CHANGELOG.md | 0 LICENSE => servant/LICENSE | 0 README.md => servant/README.md | 0 Setup.hs => servant/Setup.hs | 0 default.nix => servant/default.nix | 0 docs.sh => servant/docs.sh | 0 servant.cabal => servant/servant.cabal | 0 servant.png => servant/servant.png | Bin {src => servant/src}/Servant/API.hs | 0 {src => servant/src}/Servant/API/Alternative.hs | 0 {src => servant/src}/Servant/API/Capture.hs | 0 {src => servant/src}/Servant/API/ContentTypes.hs | 0 {src => servant/src}/Servant/API/Delete.hs | 0 {src => servant/src}/Servant/API/Get.hs | 0 {src => servant/src}/Servant/API/Header.hs | 0 {src => servant/src}/Servant/API/MatrixParam.hs | 0 {src => servant/src}/Servant/API/Patch.hs | 0 {src => servant/src}/Servant/API/Post.hs | 0 {src => servant/src}/Servant/API/Put.hs | 0 {src => servant/src}/Servant/API/QueryParam.hs | 0 {src => servant/src}/Servant/API/Raw.hs | 0 {src => servant/src}/Servant/API/ReqBody.hs | 0 {src => servant/src}/Servant/API/ResponseHeaders.hs | 0 {src => servant/src}/Servant/API/Sub.hs | 0 {src => servant/src}/Servant/Common/Text.hs | 0 {src => servant/src}/Servant/Utils/Links.hs | 0 {test => servant/test}/Doctests.hs | 0 .../test}/Servant/API/ContentTypesSpec.hs | 0 .../test}/Servant/API/ResponseHeadersSpec.hs | 0 {test => servant/test}/Servant/Common/TextSpec.hs | 0 {test => servant/test}/Servant/Utils/LinksSpec.hs | 0 {test => servant/test}/Spec.hs | 0 update-nixpkgs.sh => servant/update-nixpkgs.sh | 0 33 files changed, 0 insertions(+), 0 deletions(-) rename CHANGELOG.md => servant/CHANGELOG.md (100%) rename LICENSE => servant/LICENSE (100%) rename README.md => servant/README.md (100%) rename Setup.hs => servant/Setup.hs (100%) rename default.nix => servant/default.nix (100%) rename docs.sh => servant/docs.sh (100%) rename servant.cabal => servant/servant.cabal (100%) rename servant.png => servant/servant.png (100%) rename {src => servant/src}/Servant/API.hs (100%) rename {src => servant/src}/Servant/API/Alternative.hs (100%) rename {src => servant/src}/Servant/API/Capture.hs (100%) rename {src => servant/src}/Servant/API/ContentTypes.hs (100%) rename {src => servant/src}/Servant/API/Delete.hs (100%) rename {src => servant/src}/Servant/API/Get.hs (100%) rename {src => servant/src}/Servant/API/Header.hs (100%) rename {src => servant/src}/Servant/API/MatrixParam.hs (100%) rename {src => servant/src}/Servant/API/Patch.hs (100%) rename {src => servant/src}/Servant/API/Post.hs (100%) rename {src => servant/src}/Servant/API/Put.hs (100%) rename {src => servant/src}/Servant/API/QueryParam.hs (100%) rename {src => servant/src}/Servant/API/Raw.hs (100%) rename {src => servant/src}/Servant/API/ReqBody.hs (100%) rename {src => servant/src}/Servant/API/ResponseHeaders.hs (100%) rename {src => servant/src}/Servant/API/Sub.hs (100%) rename {src => servant/src}/Servant/Common/Text.hs (100%) rename {src => servant/src}/Servant/Utils/Links.hs (100%) rename {test => servant/test}/Doctests.hs (100%) rename {test => servant/test}/Servant/API/ContentTypesSpec.hs (100%) rename {test => servant/test}/Servant/API/ResponseHeadersSpec.hs (100%) rename {test => servant/test}/Servant/Common/TextSpec.hs (100%) rename {test => servant/test}/Servant/Utils/LinksSpec.hs (100%) rename {test => servant/test}/Spec.hs (100%) rename update-nixpkgs.sh => servant/update-nixpkgs.sh (100%) diff --git a/CHANGELOG.md b/servant/CHANGELOG.md similarity index 100% rename from CHANGELOG.md rename to servant/CHANGELOG.md diff --git a/LICENSE b/servant/LICENSE similarity index 100% rename from LICENSE rename to servant/LICENSE diff --git a/README.md b/servant/README.md similarity index 100% rename from README.md rename to servant/README.md diff --git a/Setup.hs b/servant/Setup.hs similarity index 100% rename from Setup.hs rename to servant/Setup.hs diff --git a/default.nix b/servant/default.nix similarity index 100% rename from default.nix rename to servant/default.nix diff --git a/docs.sh b/servant/docs.sh similarity index 100% rename from docs.sh rename to servant/docs.sh diff --git a/servant.cabal b/servant/servant.cabal similarity index 100% rename from servant.cabal rename to servant/servant.cabal diff --git a/servant.png b/servant/servant.png similarity index 100% rename from servant.png rename to servant/servant.png diff --git a/src/Servant/API.hs b/servant/src/Servant/API.hs similarity index 100% rename from src/Servant/API.hs rename to servant/src/Servant/API.hs diff --git a/src/Servant/API/Alternative.hs b/servant/src/Servant/API/Alternative.hs similarity index 100% rename from src/Servant/API/Alternative.hs rename to servant/src/Servant/API/Alternative.hs diff --git a/src/Servant/API/Capture.hs b/servant/src/Servant/API/Capture.hs similarity index 100% rename from src/Servant/API/Capture.hs rename to servant/src/Servant/API/Capture.hs diff --git a/src/Servant/API/ContentTypes.hs b/servant/src/Servant/API/ContentTypes.hs similarity index 100% rename from src/Servant/API/ContentTypes.hs rename to servant/src/Servant/API/ContentTypes.hs diff --git a/src/Servant/API/Delete.hs b/servant/src/Servant/API/Delete.hs similarity index 100% rename from src/Servant/API/Delete.hs rename to servant/src/Servant/API/Delete.hs diff --git a/src/Servant/API/Get.hs b/servant/src/Servant/API/Get.hs similarity index 100% rename from src/Servant/API/Get.hs rename to servant/src/Servant/API/Get.hs diff --git a/src/Servant/API/Header.hs b/servant/src/Servant/API/Header.hs similarity index 100% rename from src/Servant/API/Header.hs rename to servant/src/Servant/API/Header.hs diff --git a/src/Servant/API/MatrixParam.hs b/servant/src/Servant/API/MatrixParam.hs similarity index 100% rename from src/Servant/API/MatrixParam.hs rename to servant/src/Servant/API/MatrixParam.hs diff --git a/src/Servant/API/Patch.hs b/servant/src/Servant/API/Patch.hs similarity index 100% rename from src/Servant/API/Patch.hs rename to servant/src/Servant/API/Patch.hs diff --git a/src/Servant/API/Post.hs b/servant/src/Servant/API/Post.hs similarity index 100% rename from src/Servant/API/Post.hs rename to servant/src/Servant/API/Post.hs diff --git a/src/Servant/API/Put.hs b/servant/src/Servant/API/Put.hs similarity index 100% rename from src/Servant/API/Put.hs rename to servant/src/Servant/API/Put.hs diff --git a/src/Servant/API/QueryParam.hs b/servant/src/Servant/API/QueryParam.hs similarity index 100% rename from src/Servant/API/QueryParam.hs rename to servant/src/Servant/API/QueryParam.hs diff --git a/src/Servant/API/Raw.hs b/servant/src/Servant/API/Raw.hs similarity index 100% rename from src/Servant/API/Raw.hs rename to servant/src/Servant/API/Raw.hs diff --git a/src/Servant/API/ReqBody.hs b/servant/src/Servant/API/ReqBody.hs similarity index 100% rename from src/Servant/API/ReqBody.hs rename to servant/src/Servant/API/ReqBody.hs diff --git a/src/Servant/API/ResponseHeaders.hs b/servant/src/Servant/API/ResponseHeaders.hs similarity index 100% rename from src/Servant/API/ResponseHeaders.hs rename to servant/src/Servant/API/ResponseHeaders.hs diff --git a/src/Servant/API/Sub.hs b/servant/src/Servant/API/Sub.hs similarity index 100% rename from src/Servant/API/Sub.hs rename to servant/src/Servant/API/Sub.hs diff --git a/src/Servant/Common/Text.hs b/servant/src/Servant/Common/Text.hs similarity index 100% rename from src/Servant/Common/Text.hs rename to servant/src/Servant/Common/Text.hs diff --git a/src/Servant/Utils/Links.hs b/servant/src/Servant/Utils/Links.hs similarity index 100% rename from src/Servant/Utils/Links.hs rename to servant/src/Servant/Utils/Links.hs diff --git a/test/Doctests.hs b/servant/test/Doctests.hs similarity index 100% rename from test/Doctests.hs rename to servant/test/Doctests.hs diff --git a/test/Servant/API/ContentTypesSpec.hs b/servant/test/Servant/API/ContentTypesSpec.hs similarity index 100% rename from test/Servant/API/ContentTypesSpec.hs rename to servant/test/Servant/API/ContentTypesSpec.hs diff --git a/test/Servant/API/ResponseHeadersSpec.hs b/servant/test/Servant/API/ResponseHeadersSpec.hs similarity index 100% rename from test/Servant/API/ResponseHeadersSpec.hs rename to servant/test/Servant/API/ResponseHeadersSpec.hs diff --git a/test/Servant/Common/TextSpec.hs b/servant/test/Servant/Common/TextSpec.hs similarity index 100% rename from test/Servant/Common/TextSpec.hs rename to servant/test/Servant/Common/TextSpec.hs diff --git a/test/Servant/Utils/LinksSpec.hs b/servant/test/Servant/Utils/LinksSpec.hs similarity index 100% rename from test/Servant/Utils/LinksSpec.hs rename to servant/test/Servant/Utils/LinksSpec.hs diff --git a/test/Spec.hs b/servant/test/Spec.hs similarity index 100% rename from test/Spec.hs rename to servant/test/Spec.hs diff --git a/update-nixpkgs.sh b/servant/update-nixpkgs.sh similarity index 100% rename from update-nixpkgs.sh rename to servant/update-nixpkgs.sh