Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
gendl
gendl
Commits
8412c87f
Commit
8412c87f
authored
Mar 17, 2014
by
Dave Cooper
Browse files
update bus and robot for local build
parent
e196d5fd
Changes
2
Hide whitespace changes
Inline
Side-by-side
demos/bus/bus.asd
View file @
8412c87f
;;;; -*- coding: utf-8 -*-
<<<<<<<
Updated
upstream
(
asdf:defsystem
#:bus
:description
"The Gendl™ Wireframe School Bus Demo"
:author
"John McCarthy"
:license
"Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial
t
:version
"20140227"
:depends-on
nil
=======
(
asdf:defsystem
#:bus
:description
...
...
@@ -19,8 +13,8 @@
:version
"20140313"
:depends-on
(
:gwl-graphics
)
>>>>>>>
Stashed
changes
nil
;;
(:gwl-graphics)
#-
asdf-unicode
:defsystem-depends-on
#-
asdf-unicode
(
:asdf-encodings
)
#+
asdf-encodings
:encoding
#+
asdf-encodings
:utf-8
:components
...
...
demos/robot/robot.asd
View file @
8412c87f
;;;; -*- coding: utf-8 -*-
<<<<<<<
Updated
upstream
(
asdf:defsystem
#:robot
:description
"The Gendl™ Simplified Android Robot example "
:author
"John McCarthy"
:license
"Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial
t
:version
"20140227"
:depends-on
nil
=======
(
asdf:defsystem
#:robot
:description
...
...
@@ -20,8 +13,7 @@
:version
"20140313"
:depends-on
(
:gwl-graphics
)
>>>>>>>
Stashed
changes
nil
;;(:gwl-graphics)
#-
asdf-unicode
:defsystem-depends-on
#-
asdf-unicode
(
:asdf-encodings
)
#+
asdf-encodings
:encoding
#+
asdf-encodings
:utf-8
:components
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment