aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/games.scm
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2018-05-28 20:45:37 -0400
committerMark H Weaver <mhw@netris.org>2018-05-28 20:45:37 -0400
commit82b695b834f88c5561de40e68f3fe7aa24d3b796 (patch)
tree41743fff1013584ee4a50852a94cff01c3cc3d1c /gnu/packages/games.scm
parentfe365a3d0e4df7445bf16d3bb422a0bc6bb68ceb (diff)
parentee3c8fbee21299ce105bafca7dc63bfb096cd7c5 (diff)
downloadguix-82b695b834f88c5561de40e68f3fe7aa24d3b796.tar
guix-82b695b834f88c5561de40e68f3fe7aa24d3b796.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/games.scm')
-rw-r--r--gnu/packages/games.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index d435142f82..26a77e2404 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4968,7 +4968,7 @@ quotation from a collection of quotes.")
(description
"Xonotic-data provides the data files required by the game Xonotic.")
(license (list license:gpl2+
- license:x11)))) ; server/rcon.pl
+ (license:x11-style "file://server/rcon.pl")))))
(define-public xonotic
(package
@@ -5167,4 +5167,4 @@ development between them, and it aims to become the best possible
open-source FPS of its kind.")
(license (list license:gpl2+
license:bsd-3 ; /source/d0_blind_id folder and others
- license:x11-style))))
+ (license:x11-style "" "See file rcon.pl.")))))