summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2018-12-07 00:49:28 +0000
committerKhaled Hosny <khaledhosny@eglug.org>2018-12-07 00:49:28 +0000
commita8e5b31a3bf02776e62465852ade45f131eda175 (patch)
tree62b4a8a32f0aabc5695c399777864f3a3f1f3fe5
parent001619db74de94fe7d92229885a5b89a052fe2aa (diff)
parent496309c4e650abd5012d8e646635669d3cf1a2fa (diff)
downloadpango-a8e5b31a3bf02776e62465852ade45f131eda175.tar.gz
Merge branch 'small-fixes' into 'master'
A series of small fixes See merge request GNOME/pango!36
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--AUTHORS2
-rw-r--r--CODING_STYLE.md (renamed from HACKING)0
-rw-r--r--MAINTAINERS7
-rw-r--r--README.md (renamed from README)0
5 files changed, 1 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 585d5e95..acde7aaa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/base:latest
stages:
- build
-build-pango:
+gnome-runtime-linux:
stage: build
before_script:
- >
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 181b49d0..00000000
--- a/AUTHORS
+++ /dev/null
@@ -1,2 +0,0 @@
-Owen Taylor <otaylor@redhat.com>, with help from many others.
-See file named THANKS for a list.
diff --git a/HACKING b/CODING_STYLE.md
index 25929a78..25929a78 100644
--- a/HACKING
+++ b/CODING_STYLE.md
diff --git a/MAINTAINERS b/MAINTAINERS
deleted file mode 100644
index c04d1d2e..00000000
--- a/MAINTAINERS
+++ /dev/null
@@ -1,7 +0,0 @@
-Owen Taylor
-Email: otaylor@redhat.com
-Userid: otaylor
-
-Behdad Esfahbod
-Email: behdad@gnome.org
-Userid: behdad
diff --git a/README b/README.md
index fedd147c..fedd147c 100644
--- a/README
+++ b/README.md