aboutsummaryrefslogtreecommitdiff
path: root/ontime_clocks/copyright.txt
diff options
context:
space:
mode:
authororwell96 <orwell@bleipb.de>2018-12-03 23:17:35 +0100
committerorwell96 <orwell@bleipb.de>2018-12-03 23:17:35 +0100
commit8928f78ee6305e29ed8d3b9395fcb6564c984fdf (patch)
treecd250c2b98d7131158e3744efe238780cec73fec /ontime_clocks/copyright.txt
parenteccdad46ef2b38cd061aab7ae6bcb252a67c2218 (diff)
parenta3e0d36a68247cac40349d9089fe3c71546d75e8 (diff)
downloaddisplay_modpack-master.tar.gz
display_modpack-master.tar.bz2
display_modpack-master.zip
Merge remote-tracking branch 'upstream/master'HEADmaster
Resolved conflicts by reordering of files
Diffstat (limited to 'ontime_clocks/copyright.txt')
-rw-r--r--ontime_clocks/copyright.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/ontime_clocks/copyright.txt b/ontime_clocks/copyright.txt
index b752dff..a2afd94 100644
--- a/ontime_clocks/copyright.txt
+++ b/ontime_clocks/copyright.txt
@@ -1,4 +1,8 @@
Code, Textures and Models by Pierre-Yves Rollo (pyrollo)
-intllib support (i18n) by fat115
+intllib support (i18n) by (fat115)
intllib fallback code and tools by Diego Martínez (kaeza)
-
+Extra contibutors:
+(Thomas--S)
+Translations:
+Muhammad Nur Hidayat Yasuyoshi (MuhdNurHidayat)
+(fat115)