Merge lp:~glmark2-dev/glmark2/glmark2-package into lp:glmark2/2011.11

[kevin gunn]

Unmerged revisions

28. By Alexandros Frantzis on 2014-03-11

* New upstream release 2014.03.
* debian/control:
  - Update Standards-Version to 3.9.5.
  - Add binary packages for wayland, mir and drm variants.
* debian/rules:
  - Build wayland, mir and drm variants.
  - Programatically create .install and .manpages files for
    variant binary packages.

27. By Alexandros Frantzis on 2013-03-05

debian/rules: Update configuration flags

26. By Jesse Barker on 2012-12-18

New upstream release 2012.12.

25. By Jesse Barker on 2012-11-29

New upstream release 2012.11.

24. By Alexandros Frantzis on 2012-08-17

New upstream release 2012.08.

23. By Alexandros Frantzis on 2012-07-19

* New upstream release 2012.07.
* debian/changelog:
  - Update dates to -2012 where needed.
  - Add section for src/scene-ideas*.
  - Add section for src/libjpeg-turbo/*.

22. By Alexandros Frantzis on 2012-06-28

* debian/control:
  - Add libjpeg-dev build dependency.

21. By Alexandros Frantzis on 2012-06-21

* New upstream release 2012.06.
* debian/rules:
  - Clean compiled python code from unpacked waflib/ directory, as
    described in http://wiki.debian.org/UnpackWaf .

20. By Alexandros Frantzis on 2012-06-21

Remove changelog entry that messed up bzr merge-upstream.

19. By Alexandros Frantzis on 2012-06-11

* debian/rules:
  - Clean compiled python code from unpacked waflib/ directory, as
    described in http://wiki.debian.org/UnpackWaf .

=== added file 'COPYING'
--- COPYING	1970-01-01 00:00:00 +0000
+++ COPYING	2014-05-07 20:44:08 +0000
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

=== added file 'COPYING.SGI'
--- COPYING.SGI	1970-01-01 00:00:00 +0000
+++ COPYING.SGI	2014-05-07 20:44:08 +0000
@@ -0,0 +1,40 @@
+The data and some of the control logic for the "ideas" scene was adapted from
+the "Ideas in Motion" GLUT demo.  Per the rights granted by the source for that
+demo, the following notice is reproduced here:
+
+/*
+ * (c) Copyright 1993, Silicon Graphics, Inc.
+ * ALL RIGHTS RESERVED 
+ * Permission to use, copy, modify, and distribute this software for 
+ * any purpose and without fee is hereby granted, provided that the above
+ * copyright notice appear in all copies and that both the copyright notice
+ * and this permission notice appear in supporting documentation, and that 
+ * the name of Silicon Graphics, Inc. not be used in advertising
+ * or publicity pertaining to distribution of the software without specific,
+ * written prior permission. 
+ *
+ * THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU "AS-IS"
+ * AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR
+ * FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT SHALL SILICON
+ * GRAPHICS, INC.  BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT,
+ * SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY
+ * KIND, OR ANY DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION,
+ * LOSS OF PROFIT, LOSS OF USE, SAVINGS OR REVENUE, OR THE CLAIMS OF
+ * THIRD PARTIES, WHETHER OR NOT SILICON GRAPHICS, INC.  HAS BEEN
+ * ADVISED OF THE POSSIBILITY OF SUCH LOSS, HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
+ * POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE.
+ * 
+ * US Government Users Restricted Rights 
+ * Use, duplication, or disclosure by the Government is subject to
+ * restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
+ * (c)(1)(ii) of the Rights in Technical Data and Computer Software
+ * clause at DFARS 252.227-7013 and/or in similar or successor
+ * clauses in the FAR or the DOD or NASA FAR Supplement.
+ * Unpublished-- rights reserved under the copyright laws of the
+ * United States.  Contractor/manufacturer is Silicon Graphics,
+ * Inc., 2011 N.  Shoreline Blvd., Mountain View, CA 94039-7311.
+ *
+ * OpenGL(TM) is a trademark of Silicon Graphics, Inc.
+ */

=== renamed file 'COPYING.SGI' => 'COPYING.SGI.moved'
=== renamed file 'COPYING' => 'COPYING.moved'
=== added file 'INSTALL'
--- INSTALL	1970-01-01 00:00:00 +0000
+++ INSTALL	2014-05-07 20:44:08 +0000
@@ -0,0 +1,13 @@
+glmark2 uses the WAF build system.
+
+To configure glmark2 use:
+
+$ ./waf configure [--enable-gl --enable-glesv2 --enable-gl-drm --enable-glesv2-drm --data-path=DATA_PATH --prefix=PREFIX]
+
+To build use:
+
+$ ./waf
+
+To install use:
+
+$ ./waf install --destdir=DESTDIR

=== added file 'INSTALL.android'
--- INSTALL.android	1970-01-01 00:00:00 +0000
+++ INSTALL.android	2014-05-07 20:44:08 +0000
@@ -0,0 +1,35 @@
+The minimum Android API level for glmark2 is 9 (>= Android 2.3).
+
+Building using the SDK and NDK
+------------------------------
+
+To build and install glmark2 you need the Android SDK and NDK. The 'android',
+'adb' and 'ndk-build' tools used below are included there.
+
+To build glmark2 for Android we start by building the native part:
+
+$ cd android
+$ ndk-build
+
+To continue building the package from the command line:
+
+$ android update project -p . -s -t <target> (where target, e.g., android-10)
+$ ant debug {or release}
+
+To install to a device, you need to have set up an ADB connection
+to the device. Then do:
+
+$ adb install bin/Glmark2-debug.apk
+
+Alternatively you can load the project (in the android/ directory) in Eclipse
+using the ADT plugin and manage the build and install process from there.  Keep
+in mind that when updating the native build (ndk-build etc) you need to refresh
+the Eclipse project, otherwise it won't notice that something has changed.
+
+Building using the Android build system
+---------------------------------------
+
+Copy the glmark2 source tree to somewhere the Android build system can access
+it (eg external/glmark2) and build the GLMark2 module:
+
+$ make GLMark2

=== renamed file 'INSTALL.android' => 'INSTALL.android.moved'
=== renamed file 'INSTALL' => 'INSTALL.moved'
=== added file 'NEWS'
--- NEWS	1970-01-01 00:00:00 +0000
+++ NEWS	2014-05-07 20:44:08 +0000
@@ -0,0 +1,218 @@
+glmark2 2014.03 (20140310)
+==========================
+
+* Refactor canvas code to make it easier to support new platforms.
+* Add Wayland backend.
+* Add Mir backend.
+* Add a new 'cel' (or 'toon') shading model (scene 'shading').
+* Add a new 'clear' scene, which just clears the canvas.
+* Improve support for the Wavefront .obj file format.
+
+glmark2 2012.12 (20121218)
+==========================
+
+* Add a refraction (2 interface) and reflection benchmark (scene 'reflect').
+* Add a new canvas object which allows rendering to GBM managed surfaces
+  and page flipping to DRM managed framebuffer from a console.
+* Enhancements to visual config mechanism to consider stencil size in the
+  selection criteria and to query all config attribs.
+
+glmark2 2012.11 (20121126)
+==========================
+
+* Add a shadow mapping benchmark (scene 'shadow').
+* Consolidate EGL interactions into a separate state object.
+
+glmark2 2012.08 (20120817)
+==========================
+
+* Display benchmark results in the Android GUI.
+* Add an Android option menu offering load/save/delete benchmark list
+  functionality, access to last benchmark results, settings and
+  information about glmark2.
+* Properly handle spaces in scene options on Android.
+* Exclude from score calculation benchmarks whose set up wasn't successful.
+* Display an appropriate message (instead of a 0 FPS value) if benchmark
+  set up isn't successful.
+* Add support for standard GNU installation directories.
+
+glmark2 2012.07 (20120719)
+==========================
+
+* Add Android GUI for defining and running benchmarks.
+* Add benchmark based on the WebGL jellyfish demo (scene 'jellyfish').
+* Add benchmark based on the WebGL dynamic terrain demo (scene 'terrain').
+* Extend texture scene with the option to compute texture coordinates
+  in the shader (option 'texgen').
+* Add support for reading texture data from JPEG files.
+* Properly support options that have a finite set of acceptable values.
+
+glmark2 2012.06 (20120621)
+==========================
+
+* Add command-line option to render in fullscreen mode (--fullscreen).
+* Display the frame time in addition to the FPS for each benchmark.
+
+glmark2 2012.05 (20120524)
+==========================
+
+* Add benchmark based on the SGI "Ideas in Motion" demo.
+* Ensure that the framebuffer is drawn opaquely.
+* Add command-line option to configure the visual used for rendering
+  (--visual-config).
+* Add support for additional models and textures in the 'texture' scene.
+
+glmark2 2012.03 (20120322)
+==========================
+
+* X11:
+  - Support rendering to an off-screen surface (--off-screen).
+  - Add command-line option to select which method to use to "end"
+    a frame (--frame-end).
+
+glmark2 2012.02 (20120216)
+==========================
+
+* Consolidate X11 and Android main loops.
+* Accept command-line options on Android through either a file
+  ('/data/glmark2/args') or an extra intent key ('args').
+* Support per-scene options for displaying an FPS count on screen
+  (show-fps, fps-pos, fps-size), and remove --show-fps command-line option.
+* Support per-scene options for displaying a benchmark title on screen
+  (title, title-pos, title-size).
+* Add command-line option to run benchmarks indefinitely (--run-forever).
+* Add command-line option to annotate the benchmarks with on-screen
+  information (--annotate == -b :show-fps=true:title=#info#).
+* Move various utility classes to libmatrix.
+* Fix build issues on Android ICS.
+
+glmark2 2012.01 (20120119)
+==========================
+
+* X11:
+  - Run each benchmark in a fresh GL context. Use --reuse-context
+    to revert to the old default behavior of using the same context
+    for all benchmarks.
+  - Add option for showing a live FPS counter on screen (--show-fps).
+  - If the list of benchmarks to run contains only option-setting
+    descriptions, run the default benchmarks.
+* Android:
+  - Fix crash on platforms not supporting glMapBufferOES.
+  - Log the glmark2 score when finishing.
+  - Log an error message if we fail to find a suitable EGLContext.
+  - Implement various stability improvements.
+
+glmark2 2011.12 (20111215)
+==========================
+
+* Add benchmark for bilinear filtering implemented in the fragment
+  shader (not included in the default benchmarks).
+* Ensure we don't call any GL functions before binding a GL context.
+* Fix bug in the ShaderSource object that could lead to shader
+  compilation errors in strict OpenGL ES 2.0 implementations.
+* Refactor scene update code to reduce duplication.
+
+glmark2 2011.11 (20111116)
+==========================
+
+* Add benchmark for bump mapping using a height map.
+* Add benchmark for bump mapping using a tangent space normal map
+  (not included in the default benchmarks).
+* Implement validation support for all default benchmarks.
+* Add a colored prefix to log messages in debug mode.
+* Clean up and refactor code.
+
+glmark2 2011.10 (20111018)
+==========================
+
+* Add benchmark for buffer (VBO) updates.
+* Add benchmark for drop-shadow desktop effect.
+* Add support for glmark2 extra large models.
+* Enable the selection of additional models in the shading benchmark.
+* Gracefully handle unsupported OpenGL versions, on both X11 and Android.
+* Disable screen dimming and screen rotation on Android.
+
+glmark2 2011.09 (20110921)
+==========================
+
+* Add benchmark for blur desktop effect.
+* Add support for multiple lights in the phong shading benchmark.
+* Add support for loading models from OBJ geometry files.
+* Add Stanford Bunny model and make it available in the build benchmark.
+* Add per-scene options to set shader precision at runtime.
+* Add command-line option to specify the benchmarks to run using a text file.
+
+glmark2 2011.08 (20110818)
+==========================
+
+* Port to Android (see INSTALL.android).
+* Add benchmark based on pulsar X11 GL screensaver.
+* Add benchmark for 2D image processing using the GPU.
+* Add command line option to set the size of the output window (-s, --size).
+* Implement ShaderSource object to simplify complex shader creation.
+* Implement utility functions to access resources in an abstract way.
+
+glmark2 2011.07 (20110719)
+==========================
+
+* Replace SDL with custom window handling code.
+* Add benchmark for shader conditionals.
+* Add benchmark for shader function calls.
+* Add benchmark for shader loops.
+* Add benchmark for real phong (vs blinn-phong) lighting model.
+* Add benchmark for normal mapping.
+* Refactor Mesh class to increase flexibility in vertex attribute
+  handling.
+
+glmark2 2011.06 (20110624)
+==========================
+
+* Improve benchmark versatility by allowing runtime-configurable,
+  per-scene options.
+* Add command line option to list avalaible scenes and their
+  supported options (-l,--list-scenes).
+* Allow specifying the scenes to run and their options from the
+  command line (-b,--benchmark).
+* Add basic output validation functionality (--validate).
+* Add command line option to call glFinish() instead of swapping
+  the front and back buffers (--no-swap-buffers).
+* Manually disable VSync for GL/GLX (work around an SDL bug).
+* Replace custom math and shader infrastructure with functionality
+  provided by LibMatrix (lp:libmatrix).
+* Improve user documentation (--help and man page).
+
+glmark2 11.05 (20110530)
+==========================
+
+* Don't use the SDL_OPENGL flag for GLESv2 (LP: #761848).
+* Ensure our screen updates are not synchronized with the vertical
+  retrace (LP: 761855).
+* Use the correct GL headers depending on the flavor (desktop vs ES2).
+* Query the correct GL object for shader linking status.
+
+glmark2 11.01 (20110125)
+==========================
+
+* Fix visual corruption in glmark2-es2 due to missing depth buffer.
+* Fix linking issues with gcc 4.5.
+* Use correct GL functions to manipulate shaders vs programs.
+* Make result reporting more parser-friendly.
+* Upgrade build system to waf 1.6.2.
+
+glmark2 10.07.1 (20100728)
+==========================
+
+* Define the precision of fragment shader variables for OpenGL ES 2.0.
+
+glmark2 10.07 (20100715)
+========================
+
+* First release.
+* Included benchmarks:
+  - Rendering using vertex arrays
+  - Rendering using VBOs
+  - Texturing using nearest filtering
+  - Texturing using linear filtering
+  - Texturing using trilinear mipmapped filtering
+  - Lighting per vertex using simple GLSL shaders
+  - Lighting per pixel using elaborate GLSL shaders

=== renamed file 'NEWS' => 'NEWS.moved'
=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2014-05-07 20:44:08 +0000
@@ -0,0 +1,24 @@
+glmark2 is an OpenGL 2.0 and ES 2.0 benchmark.
+
+glmark2 was developed by Alexandros Frantzis based on the original glmark
+benchmark by Ben Smith.
+
+It is licensed under the GPLv3 (see COPYING).
+
+To build glmark2 for X11/GL(ES2) you need:
+
+ * python 2.x (>= 2.4) for the build system (waf)
+ * libpng 1.2
+
+and for OpenGL 2.0:
+
+ * libGL
+
+or for OpenGL ES 2.0:
+
+ * libEGL
+ * libGLESv2
+
+Read the INSTALL file for building/installation instructions,
+
+Read the INSTALL.android file for instructions for Android.

=== added file 'README.android'
--- README.android	1970-01-01 00:00:00 +0000
+++ README.android	2014-05-07 20:44:08 +0000
@@ -0,0 +1,50 @@
+Command-line arguments
+======================
+
+The Android version of glmark2 can accept command-line arguments from either
+an extra intent key or a file. If arguments are specified in an intent key, the
+file is disregarded.
+
+Arguments from an extra intent key
+----------------------------------
+
+The 'args' extra intent key is used to specify arguments. For example:
+
+am start -a android.intent.action.MAIN \
+         -n org.linaro.glmark2/org.linaro.glmark2.Glmark2Activity \
+         -e args '-b :duration=2 -b texture -f /path/file --debug'
+
+Arguments from a file
+---------------------
+
+If the 'args' intent key is not defined, the contents of the file
+'/data/glmark2/args' (if present) are used as command line arguments. The
+arguments can be placed in either a single or multiple lines. For example:
+
+-b :duration -b texture
+-f /path/file
+--debug
+
+Android limitations and peculiarities
+=====================================
+
+The Android version of glmark2 doesn't accept all of the command-line arguments
+that the X11 version accepts. In particular, the Android version currently
+ignores the following:
+
+--validate
+--frame-end
+--off-screen
+--reuse-context
+--fullscreen
+-l,--list-scenes
+
+The default visual config used on Android is:
+
+'red=5:green=6:blue=5:alpha=0:depth=16:buffer=1'
+
+Of course, you can change it using the '--visual-config' option.
+
+The Android system is free to resize the application at will, so although the
+'-s,--size' option is initially taken into account, it usually doesn't have any
+lasting effect.

=== renamed file 'README.android' => 'README.android.moved'
=== renamed file 'README' => 'README.moved'
=== added directory 'android'
=== renamed directory 'android' => 'android.moved'
=== added file 'android/Android.mk'
--- android/Android.mk	1970-01-01 00:00:00 +0000
+++ android/Android.mk	2014-05-07 20:44:08 +0000
@@ -0,0 +1,14 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := GLMark2
+
+LOCAL_JNI_SHARED_LIBRARIES := libglmark2-android
+
+include $(BUILD_PACKAGE)
+
+include $(LOCAL_PATH)/jni/Android.mk

=== added file 'android/AndroidManifest.xml'
--- android/AndroidManifest.xml	1970-01-01 00:00:00 +0000
+++ android/AndroidManifest.xml	2014-05-07 20:44:08 +0000
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      android:versionCode="1"
+      android:versionName="2014.03" package="org.linaro.glmark2">
+    <application android:label="@string/app_name">
+        <activity android:name="org.linaro.glmark2.MainActivity"
+                  android:label="@string/title_activity_main">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="org.linaro.glmark2.EditorActivity"
+            android:label="@string/title_activity_editor" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+        <activity android:label="@string/title_activity_glmark2"
+                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+                  android:screenOrientation="nosensor"
+                  android:process=":glmark2"
+                  android:name="org.linaro.glmark2.Glmark2Activity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+        <activity android:label="@string/title_activity_preferences"
+                  android:name="org.linaro.glmark2.MainPreferencesActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+        <activity android:label="@string/title_activity_about"
+                  android:name="org.linaro.glmark2.AboutActivity"
+                  android:theme="@android:style/Theme.Dialog">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+        <activity android:label="@string/title_activity_results"
+                  android:name="org.linaro.glmark2.ResultsActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+    </application>
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-feature android:glEsVersion="0x00020000"/>
+    <uses-sdk android:minSdkVersion="9"/>
+</manifest>

=== added file 'android/CleanSpec.mk'
--- android/CleanSpec.mk	1970-01-01 00:00:00 +0000
+++ android/CleanSpec.mk	2014-05-07 20:44:08 +0000
@@ -0,0 +1,6 @@
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/GLMark2*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/GLMark2.apk)
+
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libglmark2-android_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libglmark2-matrix_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libglmark2-png_intermediates)

=== added symlink 'android/assets'
=== target is u'../data/'
=== added file 'android/build.xml'
--- android/build.xml	1970-01-01 00:00:00 +0000
+++ android/build.xml	2014-05-07 20:44:08 +0000
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Glmark2" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>

=== added directory 'android/jni'
=== added file 'android/jni/Android.mk'
--- android/jni/Android.mk	1970-01-01 00:00:00 +0000
+++ android/jni/Android.mk	2014-05-07 20:44:08 +0000
@@ -0,0 +1,76 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_CPP_EXTENSION := .cc
+LOCAL_MODULE := libglmark2-matrix
+LOCAL_CFLAGS := -DGLMARK2_USE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor \
+                -Wno-error=unused-parameter
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/src
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/src/libmatrix/*.cc))
+LOCAL_SHARED_LIBRARIES := libdl libstlport
+
+include external/stlport/libstlport.mk
+
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libglmark2-png
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/src/libpng/*.c))
+LOCAL_C_INCLUDES := external/zlib
+
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libglmark2-jpeg
+LOCAL_CFLAGS := -Werror -Wall -Wextra -Wno-error=attributes \
+                -Wno-error=unused-parameter -Wno-error=unused-function -Wno-error=unused-variable
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/src/libjpeg-turbo/
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/src/libjpeg-turbo/simd/*.c)) \
+                   $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/src/libjpeg-turbo/simd/*.S)) \
+                   $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/src/libjpeg-turbo/*.c))
+
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_CPP_EXTENSION := .cc
+LOCAL_MODULE := libglmark2-ideas
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK2_USE_GLESv2 -Werror -Wall -Wextra\
+                -Wnon-virtual-dtor -Wno-error=unused-parameter
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
+                    $(LOCAL_PATH)/src/libmatrix
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/src/scene-ideas/*.cc))
+LOCAL_SHARED_LIBRARIES := libdl libstlport
+
+include external/stlport/libstlport.mk
+
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := libglmark2-android
+LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png libglmark2-ideas libglmark2-jpeg
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2014.03\"" \
+                -DGLMARK2_USE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor \
+                -Wno-error=unused-parameter
+LOCAL_SHARED_LIBRARIES := liblog libz libEGL libGLESv2 libandroid libdl libstlport
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
+                    $(LOCAL_PATH)/src/libmatrix \
+                    $(LOCAL_PATH)/src/scene-ideas \
+                    $(LOCAL_PATH)/src/scene-terrain \
+                    $(LOCAL_PATH)/src/libjpeg-turbo \
+                    $(LOCAL_PATH)/src/libpng \
+                    external/zlib
+LOCAL_SRC_FILES := $(filter-out src/canvas% src/gl-state% src/native-state% src/main.cpp, \
+                     $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/src/*.cpp))) \
+                   $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/src/scene-terrain/*.cpp)) \
+                   src/canvas-android.cpp
+LOCAL_PRELINK_MODULE := false
+
+include external/stlport/libstlport.mk
+
+include $(BUILD_SHARED_LIBRARY)

=== added file 'android/jni/Android.ndk.mk'
--- android/jni/Android.ndk.mk	1970-01-01 00:00:00 +0000
+++ android/jni/Android.ndk.mk	2014-05-07 20:44:08 +0000
@@ -0,0 +1,65 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_CPP_EXTENSION := .cc
+LOCAL_MODULE := libglmark2-matrix
+LOCAL_CFLAGS := -DGLMARK2_USE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor \
+                -Wno-error=unused-parameter
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/src
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/src/libmatrix/*.cc))
+
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libglmark2-png
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/src/libpng/*.c))
+
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libglmark2-jpeg
+LOCAL_CFLAGS := -Werror -Wall -Wextra -Wno-error=attributes \
+                -Wno-error=unused-parameter -Wno-error=unused-function -Wno-error=unused-variable
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/src/libjpeg-turbo/
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/src/libjpeg-turbo/simd/*.c)) \
+                   $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/src/libjpeg-turbo/simd/*.S)) \
+                   $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/src/libjpeg-turbo/*.c))
+
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_CPP_EXTENSION := .cc
+LOCAL_MODULE := libglmark2-ideas
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK2_USE_GLESv2 -Werror -Wall -Wextra\
+                -Wnon-virtual-dtor -Wno-error=unused-parameter
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
+                    $(LOCAL_PATH)/src/libmatrix
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/src/scene-ideas/*.cc))
+
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := libglmark2-android
+LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png libglmark2-ideas libglmark2-jpeg
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2014.03\"" \
+                -DGLMARK2_USE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor \
+                -Wno-error=unused-parameter
+LOCAL_LDLIBS := -landroid -llog -lGLESv2 -lEGL -lz
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
+                    $(LOCAL_PATH)/src/libmatrix \
+                    $(LOCAL_PATH)/src/scene-ideas \
+                    $(LOCAL_PATH)/src/scene-terrain \
+                    $(LOCAL_PATH)/src/libjpeg-turbo \
+                    $(LOCAL_PATH)/src/libpng
+LOCAL_SRC_FILES := $(filter-out src/canvas% src/gl-state% src/native-state% src/main.cpp, \
+                     $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/src/*.cpp))) \
+                   $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/src/scene-terrain/*.cpp)) \
+                   src/canvas-android.cpp
+
+include $(BUILD_SHARED_LIBRARY)

=== added file 'android/jni/Application.mk'
--- android/jni/Application.mk	1970-01-01 00:00:00 +0000
+++ android/jni/Application.mk	2014-05-07 20:44:08 +0000
@@ -0,0 +1,3 @@
+APP_STL := stlport_static
+APP_PLATFORM := android-9
+APP_BUILD_SCRIPT := jni/Android.ndk.mk

=== added symlink 'android/jni/src'
=== target is u'../../src/'
=== added file 'android/project.properties'
--- android/project.properties	1970-01-01 00:00:00 +0000
+++ android/project.properties	2014-05-07 20:44:08 +0000
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-10

=== added directory 'android/res'
=== added directory 'android/res/drawable'
=== added file 'android/res/drawable/menu_about.png'
Binary files android/res/drawable/menu_about.png	1970-01-01 00:00:00 +0000 and android/res/drawable/menu_about.png	2014-05-07 20:44:08 +0000 differ
=== added file 'android/res/drawable/menu_delete.png'
Binary files android/res/drawable/menu_delete.png	1970-01-01 00:00:00 +0000 and android/res/drawable/menu_delete.png	2014-05-07 20:44:08 +0000 differ
=== added file 'android/res/drawable/menu_load.png'
Binary files android/res/drawable/menu_load.png	1970-01-01 00:00:00 +0000 and android/res/drawable/menu_load.png	2014-05-07 20:44:08 +0000 differ
=== added file 'android/res/drawable/menu_results.png'
Binary files android/res/drawable/menu_results.png	1970-01-01 00:00:00 +0000 and android/res/drawable/menu_results.png	2014-05-07 20:44:08 +0000 differ
=== added file 'android/res/drawable/menu_save.png'
Binary files android/res/drawable/menu_save.png	1970-01-01 00:00:00 +0000 and android/res/drawable/menu_save.png	2014-05-07 20:44:08 +0000 differ
=== added file 'android/res/drawable/menu_settings.png'
Binary files android/res/drawable/menu_settings.png	1970-01-01 00:00:00 +0000 and android/res/drawable/menu_settings.png	2014-05-07 20:44:08 +0000 differ
=== added directory 'android/res/layout'
=== added file 'android/res/layout/activity_about.xml'
--- android/res/layout/activity_about.xml	1970-01-01 00:00:00 +0000
+++ android/res/layout/activity_about.xml	2014-05-07 20:44:08 +0000
@@ -0,0 +1,43 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:padding="10dp">
+
+    <TextView android:id="@+id/name_version"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:gravity="center_horizontal"
+              android:text="@string/about_name_version_format" />
+
+    <TextView android:id="@+id/description"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:gravity="center_horizontal"
+              android:text="@string/about_description" />
+
+    <TextView android:id="@+id/copyright"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:gravity="center_horizontal"
+              android:text="@string/about_copyright" />
+
+    <TextView android:id="@+id/url"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:gravity="center_horizontal"
+              android:text="@string/about_url" />
+
+    <TextView android:id="@+id/license1"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:gravity="center_horizontal"
+              android:text="@string/about_license_1" />
+
+    <TextView android:id="@+id/license2"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:gravity="center_horizontal"
+              android:text="@string/about_license_2" />
+</LinearLayout>
+

=== added file 'android/res/layout/activity_editor.xml'
--- android/res/layout/activity_editor.xml	1970-01-01 00:00:00 +0000
+++ android/res/layout/activity_editor.xml	2014-05-07 20:44:08 +0000
@@ -0,0 +1,34 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" >
+
+    <LinearLayout android:id="@+id/buttonLinearLayout" 
+                  android:layout_width="match_parent" 
+                  android:layout_height="wrap_content" 
+                  android:layout_alignParentBottom="true">
+
+        <Button android:id="@+id/runButton"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1.0"
+                android:layout_alignParentBottom="true"
+                android:text="@string/runButtonText" />
+
+        <Button android:id="@+id/saveButton"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1.0"
+                android:layout_alignParentBottom="true"
+                android:text="@string/saveButtonText" />
+
+    </LinearLayout>
+
+
+    <ListView android:id="@+id/editorListView"
+              android:layout_above="@id/buttonLinearLayout"
+              android:layout_weight="1.0"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:layout_alignParentTop="true" />
+</RelativeLayout>

=== added file 'android/res/layout/activity_main.xml'
--- android/res/layout/activity_main.xml	1970-01-01 00:00:00 +0000
+++ android/res/layout/activity_main.xml	2014-05-07 20:44:08 +0000
@@ -0,0 +1,20 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" >
+
+    <Button android:id="@+id/runButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:text="@string/runButtonText" />
+
+    <ListView android:id="@+id/benchmarkListView"
+              android:layout_above="@id/runButton"
+              android:layout_weight="1.0"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:layout_alignParentTop="true" />
+
+
+</RelativeLayout>

=== added file 'android/res/layout/activity_results.xml'
--- android/res/layout/activity_results.xml	1970-01-01 00:00:00 +0000
+++ android/res/layout/activity_results.xml	2014-05-07 20:44:08 +0000
@@ -0,0 +1,15 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+    <HorizontalScrollView android:layout_width="match_parent"
+                          android:layout_height="wrap_content">
+
+        <TextView android:id="@+id/results"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:typeface="monospace" />
+
+    </HorizontalScrollView>
+
+</ScrollView>

=== added file 'android/res/layout/list_header.xml'
--- android/res/layout/list_header.xml	1970-01-01 00:00:00 +0000
+++ android/res/layout/list_header.xml	2014-05-07 20:44:08 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          style="?android:attr/listSeparatorTextViewStyle"
+          android:id="@+id/listHeader" />

=== added file 'android/res/layout/list_item.xml'
--- android/res/layout/list_item.xml	1970-01-01 00:00:00 +0000
+++ android/res/layout/list_item.xml	2014-05-07 20:44:08 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/listPreferredItemHeight"
+                android:gravity="center_vertical"
+                android:paddingRight="?android:attr/scrollbarSize" >
+
+    <RelativeLayout android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15dip"
+                    android:layout_marginRight="6dip"
+                    android:layout_marginTop="6dip"
+                    android:layout_marginBottom="6dip"
+                    android:layout_weight="1">
+
+        <TextView android:id="@+id/title"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView android:id="@+id/summary"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_alignLeft="@id/title"
+                  android:layout_below="@id/title"
+                  android:textAppearance="?android:attr/textAppearanceSmall"
+                  android:textColor="?android:attr/textColorSecondary" />
+
+    </RelativeLayout>
+
+</LinearLayout>

=== added file 'android/res/layout/save_dialog.xml'
--- android/res/layout/save_dialog.xml	1970-01-01 00:00:00 +0000
+++ android/res/layout/save_dialog.xml	2014-05-07 20:44:08 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical" >
+
+    <RelativeLayout android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15dip"
+                    android:layout_marginRight="15dip"
+                    android:layout_marginTop="6dip"
+                    android:layout_marginBottom="6dip"
+                    android:layout_weight="1">
+
+        <EditText android:id="@+id/listName"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content" />
+
+        <CheckBox android:id="@+id/external"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_alignLeft="@id/listName"
+                  android:layout_below="@id/listName"
+                  android:text="@string/externalSaveDialogText"/>
+
+    </RelativeLayout>
+
+</LinearLayout>

=== added directory 'android/res/menu'
=== added file 'android/res/menu/main_options_menu.xml'
--- android/res/menu/main_options_menu.xml	1970-01-01 00:00:00 +0000
+++ android/res/menu/main_options_menu.xml	2014-05-07 20:44:08 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/save_benchmark_list"
+          android:title="@string/saveMainOptionsText"
+          android:icon="@drawable/menu_save" />
+
+    <item android:id="@+id/load_benchmark_list"
+          android:title="@string/loadMainOptionsText"
+          android:icon="@drawable/menu_load" />
+
+    <item android:id="@+id/delete_benchmark_list"
+          android:title="@string/deleteMainOptionsText"
+          android:icon="@drawable/menu_delete" />
+
+    <item android:id="@+id/settings"
+          android:title="@string/settingsMainOptionsText"
+          android:icon="@drawable/menu_settings" />
+
+    <item android:id="@+id/results"
+          android:title="@string/resultsMainOptionsText"
+          android:icon="@drawable/menu_results" />
+
+    <item android:id="@+id/about"
+          android:title="@string/aboutMainOptionsText"
+          android:icon="@drawable/menu_about" />
+</menu>

=== added directory 'android/res/values'
=== added file 'android/res/values/strings.xml'
--- android/res/values/strings.xml	1970-01-01 00:00:00 +0000
+++ android/res/values/strings.xml	2014-05-07 20:44:08 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">GLMark2</string>
+    <string name="title_activity_main">GLMark2</string>
+    <string name="title_activity_editor">GLMark2 Benchmark Editor</string>
+    <string name="title_activity_preferences">GLMark2 Settings</string>
+    <string name="title_activity_about">About GLMark2</string>
+    <string name="title_activity_results">GLMark2 Results</string>
+    <string name="title_activity_glmark2">GLMark2</string>
+    <string name="runButtonText">Run</string>
+    <string name="saveButtonText">Save</string>
+
+    <string name="saveMainOptionsText">Save list</string>
+    <string name="loadMainOptionsText">Load list</string>
+    <string name="deleteMainOptionsText">Delete list</string>
+    <string name="settingsMainOptionsText">Settings</string>
+    <string name="resultsMainOptionsText">Last results</string>
+    <string name="aboutMainOptionsText">About</string>
+
+    <string name="externalSaveDialogText">Save to external storage</string>
+
+    <string name="runForeverPreferenceTitle">Run forever</string>
+    <string name="runForeverPreferenceSummary">Run indefinitely, looping from the last benchmark back to the first</string>
+    <string name="logDebugPreferenceTitle">Log debug messages</string>
+    <string name="logDebugPreferenceSummary">Display debug messages in the log</string>
+    <string name="showResultsPreferenceTitle">Show benchmark results</string>
+    <string name="showResultsPreferenceSummary">Show results after running benchmarks</string>
+
+    <string name="about_name_version_format">GLMark2 %1$s</string>
+    <string name="about_description">OpenGL (ES) 2.0 benchmark suite</string>
+    <string name="about_copyright">Copyright © 2010-2012 Linaro Limited</string>
+    <string name="about_url">http://launchpad.net/glmark2</string>
+    <string name="about_license_1">
+        glmark2 is free software: you can redistribute it and/or modify it
+        under the terms of the GNU General Public License as published by the
+        Free Software Foundation, either version 3 of the License, or (at your
+        option) any later version
+    </string>
+    <string name="about_license_2">
+        glmark2 is distributed in the hope that it will be useful, but WITHOUT ANY
+        WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+        FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+        details.
+    </string>
+
+</resources>

=== added directory 'android/res/xml'
=== added file 'android/res/xml/preferences.xml'
--- android/res/xml/preferences.xml	1970-01-01 00:00:00 +0000
+++ android/res/xml/preferences.xml	2014-05-07 20:44:08 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <CheckBoxPreference android:key="run_forever"
+                        android:title="@string/runForeverPreferenceTitle"
+                        android:summary="@string/runForeverPreferenceSummary"
+                        android:defaultValue="false" />
+    <CheckBoxPreference android:key="log_debug"
+                        android:title="@string/logDebugPreferenceTitle"
+                        android:summary="@string/logDebugPreferenceSummary"
+                        android:defaultValue="false" />
+    <CheckBoxPreference android:key="show_results"
+                        android:title="@string/showResultsPreferenceTitle"
+                        android:summary="@string/showResultsPreferenceSummary"
+                        android:defaultValue="true" />
+</PreferenceScreen>

=== added directory 'android/src'
=== added directory 'android/src/org'
=== added directory 'android/src/org/linaro'
=== added directory 'android/src/org/linaro/glmark2'
=== added file 'android/src/org/linaro/glmark2/AboutActivity.java'
--- android/src/org/linaro/glmark2/AboutActivity.java	1970-01-01 00:00:00 +0000
+++ android/src/org/linaro/glmark2/AboutActivity.java	2014-05-07 20:44:08 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2012 Linaro Limited
+ *
+ * This file is part of the glmark2 OpenGL (ES) 2.0 benchmark.
+ *
+ * glmark2 is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * glmark2 is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * glmark2.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *  Alexandros Frantzis
+ */
+package org.linaro.glmark2;
+
+import android.app.Activity;
+import android.content.pm.PackageInfo;
+import android.os.Bundle;
+import android.view.Window;
+import android.widget.TextView;
+
+public class AboutActivity extends Activity {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        setContentView(R.layout.activity_about);
+
+        /* Get the application version */
+        String versionName = "?";
+
+        try {
+            PackageInfo info = getPackageManager().getPackageInfo(getPackageName(), 0);
+            versionName = info.versionName;
+        }
+        catch (Exception e) {
+        }
+
+        /* Display the application version */
+        TextView tv = (TextView) findViewById(R.id.name_version);
+        String formatString = getString(R.string.about_name_version_format);
+        tv.setText(String.format(formatString, versionName));
+    }
+}

=== added file 'android/src/org/linaro/glmark2/BenchmarkListManager.java'
--- android/src/org/linaro/glmark2/BenchmarkListManager.java	1970-01-01 00:00:00 +0000
+++ android/src/org/linaro/glmark2/BenchmarkListManager.java	2014-05-07 20:44:08 +0000
@@ -0,0 +1,189 @@
+/*
+ * Copyright © 2012 Linaro Limited
+ *
+ * This file is part of the glmark2 OpenGL (ES) 2.0 benchmark.
+ *
+ * glmark2 is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * glmark2 is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * glmark2.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *  Alexandros Frantzis
+ */
+package org.linaro.glmark2;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.io.*;
+
+import android.app.Activity;
+import android.os.Environment;
+
+class BenchmarkListManager {
+
+    private ArrayList<String> benchmarks;
+    private Activity activity;
+
+    BenchmarkListManager(Activity activity, ArrayList<String> benchmarks)
+    {
+        this.activity = activity;
+        if (benchmarks == null) {
+            this.benchmarks = new ArrayList<String>();
+            this.benchmarks.add("Add benchmark...");
+        }
+        else {
+            this.benchmarks = benchmarks;
+        }
+    }
+
+    /** 
+     * Gets the list holding the benchmarks.
+     *
+     * The reference to this list is constant for the life of
+     * the BenchmarkListManager,
+     * 
+     * @return the operation error code
+     */
+    ArrayList<String> getBenchmarkList() {
+        return benchmarks;
+    }
+
+    /** 
+     * Gets the saved benchmark lists.
+     * 
+     * Each list name is prefixed with either "internal/" or "external/"
+     * to denote in which storage area it is saved in.
+     * 
+     * @return an array containing the saved list names
+     */
+     String[] getSavedLists() {
+        File externalPath = getSavedListPath(true);
+        File internalPath = getSavedListPath(false);
+        ArrayList<String> lists = new ArrayList<String>();
+
+        if (externalPath != null && externalPath.isDirectory()) {
+            for (File f: externalPath.listFiles())
+                lists.add("external/" + f.getName());
+        }
+
+        if (internalPath != null && internalPath.isDirectory()) {
+            for (File f: internalPath.listFiles())
+                lists.add("internal/" + f.getName());
+        }
+
+        Collections.sort(lists);
+
+        String[] a = new String[0];
+        return lists.toArray(a);
+    }
+
+    /** 
+     * Saves the current benchmark list to a file.
+     * 
+     * @param listName the list filename
+     * @param external whether the file is to be stored in external storage
+     */
+    void saveBenchmarkList(String listName, boolean external) throws Exception {
+        File listPath = getSavedListPath(external);
+        if (listPath == null)
+            throw new Exception("External storage not present");
+
+        listPath.mkdirs();
+
+        File f = new File(listPath, listName);
+
+        BufferedWriter out = new BufferedWriter(new FileWriter(f));
+        try {
+            for (int i = 0; i < benchmarks.size() - 1; i++) {
+                out.write(benchmarks.get(i));
+                out.newLine();
+            }
+        }
+        catch (Exception ex) {
+            throw ex;
+        }
+        finally {
+            out.close();
+        }
+    }
+
+    /** 
+     * Loads a benchmark list from a file.
+     * 
+     * @param listName the list filename
+     * @param external whether the file is stored in external storage
+     */
+    void loadBenchmarkList(String listName, boolean external) throws Exception {
+        /* Get the list file path */
+        File listPath = getSavedListPath(external);
+        if (listPath == null)
+            throw new Exception("External storage not present");
+
+        File f = new File(listPath, listName);
+
+        ArrayList<String> newBenchmarks = new ArrayList<String>();
+
+        /* Read benchmarks from file */
+        BufferedReader reader = new BufferedReader(new FileReader(f));
+        String line = null;
+
+        while ((line = reader.readLine()) != null)
+            newBenchmarks.add(line);
+
+        /* If everything went well, replace current benchmarks */
+        benchmarks.clear();
+        benchmarks.addAll(newBenchmarks);
+        benchmarks.add("Add benchmark...");
+    }
+
+    /** 
+     * Delete a benchmark list file.
+     * 
+     * @param listName the list filename
+     * @param external whether the file is stored in external storage
+     */
+    void deleteBenchmarkList(String listName, boolean external) throws Exception {
+        /* Get the list file path */
+        File listPath = getSavedListPath(external);
+        if (listPath == null)
+            throw new Exception("External storage not present");
+
+        File f = new File(listPath, listName);
+        f.delete();
+    }
+
+    /** 
+     * Gets the path where benchmark lists are saved in.
+     * 
+     * @param external whether to get the path for external storage
+     * 
+     * @return the saved list path
+     */
+    private File getSavedListPath(boolean external) {
+        File f = null;
+
+        if (external) {
+            String state = Environment.getExternalStorageState();
+            if (!Environment.MEDIA_MOUNTED.equals(state))
+                return null;
+            f = activity.getExternalFilesDir(null);
+        }
+        else {
+            f = activity.getFilesDir();
+        }
+
+        if (f != null)
+            f = new File(f, "lists");
+
+        return f;
+    }
+}

=== added file 'android/src/org/linaro/glmark2/EditorActivity.java'
--- android/src/org/linaro/glmark2/EditorActivity.java	1970-01-01 00:00:00 +0000
+++ android/src/org/linaro/glmark2/EditorActivity.java	2014-05-07 20:44:08 +0000
@@ -0,0 +1,548 @@
+/*
+ * Copyright © 2012 Linaro Limited
+ *
+ * This file is part of the glmark2 OpenGL (ES) 2.0 benchmark.
+ *
+ * glmark2 is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * glmark2 is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * glmark2.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *  Alexandros Frantzis
+ */
+package org.linaro.glmark2;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnDismissListener;
+import android.content.Intent;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.text.SpannableString;
+import android.text.style.ForegroundColorSpan;
+import android.util.Log;
+import android.view.inputmethod.EditorInfo;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemLongClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.TextView.OnEditorActionListener;
+
+public class EditorActivity extends Activity {
+    public static final int DIALOG_SCENE_NAME_ID = 0;
+    public static final int DIALOG_SCENE_OPTION_TEXT_ID = 1;
+    public static final int DIALOG_SCENE_OPTION_LIST_ID = 2;
+
+    public static final int ITEM_POSITION_SCENE_NAME_HEADER = 0;
+    public static final int ITEM_POSITION_SCENE_NAME = 1;
+    public static final int ITEM_POSITION_SCENE_OPTION_HEADER = 2;
+    public static final int ITEM_POSITION_SCENE_OPTION = 3;
+
+    private EditorItemAdapter adapter;
+    private ArrayList<SceneInfo> sceneInfoList;
+    private String[] sceneNames;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_editor);
+
+        /* Get information about the available scenes */
+        sceneInfoList = getSceneInfoList();
+        sceneNames = getSceneNames();
+
+        /* Read information sent by the main activity */
+        final int benchmarkPos = this.getIntent().getIntExtra("benchmark-pos", 0);
+        String benchmarkText = getIntent().getStringExtra("benchmark-text");
+        if (benchmarkText.isEmpty())
+            benchmarkText = sceneNames[0];
+
+        /* Set up the run button */
+        Button runButton = (Button) findViewById(R.id.runButton);
+        runButton.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                Intent intent = new Intent(EditorActivity.this, Glmark2Activity.class);
+                String args = "-b \"" + getBenchmarkDescriptionText() + "\"";
+                intent.putExtra("args", args);
+                startActivity(intent);
+            }
+        });
+
+        /* Set up the save button */
+        Button button = (Button) findViewById(R.id.saveButton);
+        button.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                String newBenchmarkText = getBenchmarkDescriptionText();
+                Intent intent = new Intent();
+                intent.putExtra("benchmark-text", newBenchmarkText);
+                intent.putExtra("benchmark-pos", benchmarkPos);
+                setResult(RESULT_OK, intent);
+                finish();
+            }
+        });
+
+        /* Set up list view */
+        ListView lv = (ListView) findViewById(R.id.editorListView);
+        adapter = new EditorItemAdapter(this, R.layout.list_item,
+                                        getEditorItemList(benchmarkText));
+        lv.setAdapter(adapter);
+
+        lv.setOnItemClickListener(new OnItemClickListener() {
+            public void onItemClick(AdapterView<?> parentView, View childView, int position, long id) {
+                Bundle bundle = new Bundle();
+                bundle.putInt("item-pos", position);
+                /* Show the right dialog, depending on the clicked list position */
+                if (position == ITEM_POSITION_SCENE_NAME) {
+                    showDialog(DIALOG_SCENE_NAME_ID, bundle);
+                }
+                else if (position >= ITEM_POSITION_SCENE_OPTION) {
+                    String[] values = adapter.getItem(position).option.acceptableValues;
+                    if (values.length == 0)
+                        showDialog(DIALOG_SCENE_OPTION_TEXT_ID, bundle);
+                    else
+                        showDialog(DIALOG_SCENE_OPTION_LIST_ID, bundle);
+                }
+            }
+        });
+
+        lv.setOnItemLongClickListener(new OnItemLongClickListener() {
+            public boolean onItemLongClick(AdapterView<?> parentView, View childView, int position, long id) {
+                /* Reset the value of the long-clicked option */
+                if (position >= ITEM_POSITION_SCENE_OPTION) {
+                    EditorItem item = adapter.getItem(position);
+                    item.value = null;
+                    adapter.notifyDataSetChanged();
+                }
+                return true;
+            }
+        });
+    }
+
+    @Override
+    protected Dialog onCreateDialog(int id, Bundle bundle) {
+        final int itemPos = bundle.getInt("item-pos");
+        Dialog dialog;
+        final int finalId = id;
+
+        switch (id) {
+            case DIALOG_SCENE_NAME_ID:
+                {
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                builder.setTitle("Pick a scene");
+                builder.setItems(sceneNames, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int item) {
+                        adapter.clear();
+                        for (EditorItem ei: getEditorItemList(sceneNames[item]))
+                            adapter.add(ei);
+                        adapter.notifyDataSetChanged();
+                        dismissDialog(DIALOG_SCENE_NAME_ID);
+                    }
+                });
+                dialog = builder.create();
+                }
+                break;
+
+            case DIALOG_SCENE_OPTION_TEXT_ID:
+                {
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                final EditorItem item = adapter.getItem(itemPos);
+                final EditText input = new EditText(this);
+                if (item.value != null)
+                    input.setText(item.value);
+
+                input.setOnEditorActionListener(new OnEditorActionListener() {
+                    public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                        if (actionId == EditorInfo.IME_ACTION_DONE ||
+                            (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER &&
+                             event.getAction() == KeyEvent.ACTION_UP))
+                        {
+                            item.value = v.getText().toString();
+                            adapter.notifyDataSetChanged();
+                            dismissDialog(DIALOG_SCENE_OPTION_TEXT_ID);
+                        }
+                        return true;
+                    }
+                });
+                builder.setTitle(item.option.name + ": " + item.option.description);
+                dialog = builder.create();
+                ((AlertDialog)dialog).setView(input, 15, 6, 15, 6);
+                dialog.getWindow().setSoftInputMode(
+                        WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN |
+                        WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
+                        );
+
+                }
+                break;
+
+            case DIALOG_SCENE_OPTION_LIST_ID:
+                {
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                final EditorItem item = adapter.getItem(itemPos);
+                builder.setTitle(item.option.name + ": " + item.option.description);
+
+                builder.setItems(item.option.acceptableValues, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int index) {
+                        item.value = item.option.acceptableValues[index];
+                        adapter.notifyDataSetChanged();
+                        dismissDialog(DIALOG_SCENE_OPTION_LIST_ID);
+                    }
+                });
+
+                dialog = builder.create();
+                }
+                break;
+
+            default:
+                dialog = null;
+                break;
+        }
+
+        if (dialog != null) {
+            dialog.setOnDismissListener(new OnDismissListener() {
+                public void onDismiss(DialogInterface dialog) {
+                    removeDialog(finalId);
+                }
+            });
+        }
+
+        return dialog;
+    }
+
+    /**
+     * Gets the value of an option.
+     *
+     * @param benchArray an array of option strings ("opt=val")
+     * @param opt the options to get the value of
+     *
+     * @return the value or null
+     */
+    private String getOptionValue(String[] benchArray, String opt) {
+        String ret = null;
+
+        /* Search from the end to the beginning */
+        for (int n = benchArray.length - 1; n >= 0; n--) {
+            String s = benchArray[n].trim();
+            if (s.startsWith(opt + "=")) {
+                int i = s.indexOf('=');
+                if (i >= 0 && i + 1 < s.length()) {
+                    ret = s.substring(i + 1).trim();
+                    break;
+                }
+            }
+        }
+
+        return ret;
+    }
+
+    /**
+     * Gets the benchmark description string of the current editing state.
+     *
+     * @return the string
+     */
+    private String getBenchmarkDescriptionText() {
+        String ret = "";
+
+        for (int i = 0; i < adapter.getCount(); i++) {
+            /* Convert each list item to a proper string representation */
+            EditorItem item = adapter.getItem(i);
+            if (item == null)
+                continue;
+
+            String s = "";
+
+            /*
+             * Append "opt=" if this is an option item, except the
+             * "__custom__" item.
+             */
+            if (item.option != null && item.value != null &&
+                !item.option.name.equals("__custom__"))
+            {
+                s += item.option.name + "=";
+            }
+
+            /*
+             * Append the item value if this is not "__custom__".
+             */
+            if (item.value != null && !item.value.equals("__custom__"))
+                s += item.value;
+
+            /*
+             * Append ":" to the description string if needed.
+             */
+            if (!s.isEmpty() && !ret.isEmpty())
+                ret += ":";
+
+            /* Append the item representation */
+            ret += s;
+        }
+
+        return ret;
+    }
+
+    /**
+     * Creates an EditorItem list from a benchmark description string.
+     *
+     * @param benchDesc the benchmark description string
+     *
+     * @return the list
+     */
+    private ArrayList<EditorItem> getEditorItemList(String benchDesc) {
+        String[] benchArray = benchDesc.split(":");
+        String benchName = benchArray[0].trim();
+
+        if (benchName.isEmpty())
+            benchName = "__custom__";
+
+        /* Find SceneInfo from name */
+        SceneInfo sceneInfo = null;
+        for (SceneInfo si: sceneInfoList) {
+            if (si.name.equals(benchName)) {
+                sceneInfo = si;
+                break;
+            }
+        }
+
+        /* If we couldn't find a matching SceneInfo, use __custom__ */
+        if (sceneInfo == null) {
+            for (SceneInfo si: sceneInfoList) {
+                if (si.name.equals("__custom__")) {
+                    sceneInfo = si;
+                    break;
+                }
+            }
+        }
+
+        ArrayList<EditorItem> l = new ArrayList<EditorItem>();
+
+        /* Append null item for Scene header */
+        l.add(null);
+
+        /* Append scene name item */
+        l.add(new EditorItem(null, sceneInfo.name));
+
+        /* Append null item for Options header */
+        l.add(null);
+
+        /* Append items to the list */
+        if (!sceneInfo.name.equals("__custom__")) {
+            /* Append scene option items */
+            for (SceneInfo.Option opt: sceneInfo.options)
+                l.add(new EditorItem(opt, getOptionValue(benchArray, opt.name)));
+        }
+        else {
+            String desc = new String(benchDesc);
+            if (desc.startsWith("__custom__"))
+                desc = "";
+
+            /* Append scene option items (only one for __custom__) */
+            for (SceneInfo.Option opt: sceneInfo.options)
+                l.add(new EditorItem(opt, desc));
+        }
+
+        return l;
+    }
+
+    /**
+     * Gets a list of information about the available scenes.
+     *
+     * @return the list
+     */
+    private ArrayList<SceneInfo> getSceneInfoList() {
+        ArrayList<SceneInfo> l = new ArrayList<SceneInfo>();
+        SceneInfo customSceneInfo = new SceneInfo("__custom__");
+        customSceneInfo.addOption("__custom__", "Custom benchmark string", "", new String[0]);
+
+        for (Parcelable p: getIntent().getParcelableArrayExtra("scene-info"))
+            l.add((SceneInfo)p);
+
+        /* Sort SceneInfo list by name */
+        Collections.sort(l, new Comparator<SceneInfo>() {
+            public int compare(SceneInfo s1, SceneInfo s2) {
+                return s1.name.compareTo(s2.name);
+            }
+        });
+
+        /* Add the "__custom__" SceneInfo */
+        l.add(customSceneInfo);
+
+        return l;
+    }
+
+    /**
+     * Gets the array of scene names.
+     *
+     * @return the array
+     */
+    private String[] getSceneNames() {
+        ArrayList<String> l = new ArrayList<String>();
+
+        for (SceneInfo si: sceneInfoList) {
+            if (!si.name.isEmpty())
+                l.add(si.name);
+        }
+
+        String[] a = new String[0];
+        return l.toArray(a);
+    }
+
+
+    static private class EditorItem {
+        SceneInfo.Option option;
+
+        public EditorItem(SceneInfo.Option o, String value) {
+            this.option = o;
+            this.value = value;
+        }
+
+        public String value;
+    }
+
+    /**
+     * A ListView adapter that creates list item views from EditorItems
+     */
+    private class EditorItemAdapter extends ArrayAdapter<EditorItem> {
+        static final int VIEW_TYPE_HEADER = 0;
+        static final int VIEW_TYPE_SCENE_NAME = 1;
+        static final int VIEW_TYPE_SCENE_OPTION = 2;
+        static final int VIEW_TYPE_COUNT = 3;
+
+        public ArrayList<EditorItem> items;
+
+        public EditorItemAdapter(Context context, int textViewResourceId,
+                                 ArrayList<EditorItem> items)
+        {
+            super(context, textViewResourceId, items);
+            this.items = items;
+        }
+
+        @Override
+        public boolean isEnabled(int position) {
+            return position == ITEM_POSITION_SCENE_NAME ||
+                   position >= ITEM_POSITION_SCENE_OPTION;
+        }
+
+        @Override
+        public int getItemViewType(int position) {
+            if (position == ITEM_POSITION_SCENE_NAME)
+                return VIEW_TYPE_SCENE_NAME;
+            else if (position >= ITEM_POSITION_SCENE_OPTION)
+                return VIEW_TYPE_SCENE_OPTION;
+            else
+                return VIEW_TYPE_HEADER;
+        }
+
+        @Override
+        public int getViewTypeCount() {
+            return VIEW_TYPE_COUNT;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            int viewType = getItemViewType(position);
+            View v = null;
+
+            if (viewType == VIEW_TYPE_HEADER)
+                v = getViewHeader(position, convertView);
+            else if (viewType == VIEW_TYPE_SCENE_NAME)
+                v = getViewScene(position, convertView);
+            else if (viewType == VIEW_TYPE_SCENE_OPTION)
+                v = getViewOption(position, convertView);
+
+            return v;
+        }
+
+        private View getViewHeader(int position, View convertView) {
+            /* Get the view/widget to use */
+            View v = convertView;
+            if (v == null) {
+                LayoutInflater vi = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                v = vi.inflate(R.layout.list_header, null);
+            }
+
+            TextView tv = (TextView) v;
+
+            if (position == ITEM_POSITION_SCENE_NAME_HEADER)
+                tv.setText("Scene");
+            else if (position == ITEM_POSITION_SCENE_OPTION_HEADER)
+                tv.setText("Options");
+
+            return tv;
+        }
+
+        private View getViewScene(int position, View convertView) {
+            /* Get the view/widget to use */
+            View v = convertView;
+            if (v == null) {
+                LayoutInflater vi = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                v = vi.inflate(R.layout.list_item, null);
+            }
+
+            EditorItem item = items.get(position);
+
+            TextView title = (TextView) v.findViewById(R.id.title);
+            TextView summary = (TextView) v.findViewById(R.id.summary);
+
+            if (title != null)
+                title.setText(item.value);
+            if (summary != null)
+                summary.setText("The scene to use");
+
+            return v;
+        }
+
+        private View getViewOption(int position, View convertView) {
+            /* Get the view/widget to use */
+            View v = convertView;
+            if (v == null) {
+                LayoutInflater vi = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                v = vi.inflate(R.layout.list_item, null);
+            }
+
+            EditorItem item = items.get(position);
+
+            TextView title = (TextView) v.findViewById(R.id.title);
+            TextView summary = (TextView) v.findViewById(R.id.summary);
+            boolean hasUserSetValue = item.value != null;
+            String value = hasUserSetValue ? item.value : item.option.defaultValue;
+
+            if (title != null) {
+                /* If the option has been edited by the user show it with emphasis */
+                SpannableString titleText = new SpannableString(item.option.name + " = " + value);
+                ForegroundColorSpan span = new ForegroundColorSpan(hasUserSetValue ? Color.CYAN : Color.LTGRAY);
+                titleText.setSpan(span, item.option.name.length() + " = ".length(), titleText.length(), 0);
+                title.setText(titleText);
+            }
+
+            if (summary != null)
+                summary.setText(item.option.description);
+
+            return v;
+        }
+    }
+}

=== added file 'android/src/org/linaro/glmark2/GLVisualConfig.java'
--- android/src/org/linaro/glmark2/GLVisualConfig.java	1970-01-01 00:00:00 +0000
+++ android/src/org/linaro/glmark2/GLVisualConfig.java	2014-05-07 20:44:08 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2012 Linaro Limited
+ *
+ * This file is part of the glmark2 OpenGL (ES) 2.0 benchmark.
+ *
+ * glmark2 is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * glmark2 is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * glmark2.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *  Alexandros Frantzis
+ */
+package org.linaro.glmark2;
+
+/** 
+ * Class that holds a configuration of a GL visual.
+ */
+class GLVisualConfig {
+    public GLVisualConfig() {}
+    public GLVisualConfig(int r, int g, int b, int a, int d, int s, int buf) {
+        red = r;
+        green = g;
+        blue = b;
+        alpha = a;
+        depth = d;
+        stencil = s;
+        buffer = buf;
+    }
+
+    public int red;
+    public int green;
+    public int blue;
+    public int alpha;
+    public int depth;
+    public int stencil;
+    public int buffer;
+}

=== added file 'android/src/org/linaro/glmark2/Glmark2Activity.java'
--- android/src/org/linaro/glmark2/Glmark2Activity.java	1970-01-01 00:00:00 +0000
+++ android/src/org/linaro/glmark2/Glmark2Activity.java	2014-05-07 20:44:08 +0000
@@ -0,0 +1,88 @@
+package org.linaro.glmark2;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.opengl.GLSurfaceView;
+import android.app.Dialog;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Context;
+import android.os.PowerManager;
+import android.os.PowerManager.WakeLock;
+
+public class Glmark2Activity extends Activity {
+    public static final int DIALOG_EGLCONFIG_FAIL_ID = 0;
+    public static final String TAG = "GLMark2";
+    private WakeLock mWakeLock;
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        mWakeLock.release();
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+        mWakeLock = pm.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, TAG);
+        mWakeLock.acquire();
+
+        mGLView = new Glmark2SurfaceView(this);
+        setContentView(mGLView);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        mGLView.onPause();
+        Glmark2Activity.this.finish();
+        android.os.Process.killProcess(android.os.Process.myPid());
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mGLView.onResume();
+    }
+
+    @Override
+    protected Dialog onCreateDialog(int id) {
+        Dialog dialog;
+        switch (id) {
+            case DIALOG_EGLCONFIG_FAIL_ID:
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                builder.setMessage("Glmark2 cannot run because it couldn't find a suitable EGLConfig for GLES2.0. Please check that proper GLES2.0 drivers are installed.");
+                builder.setCancelable(false);
+                builder.setPositiveButton("Quit",
+                    new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int id) {
+                            Glmark2Activity.this.finish();
+                            /*
+                             * Force process shutdown. There is no safer way to
+                             * do this, as we have open threads we can't close
+                             * when we fail to get an EGLConfig
+                             */
+                            android.os.Process.killProcess(android.os.Process.myPid());
+                        }
+                    });
+
+                dialog = builder.create();
+                break;
+            default:
+                dialog = null;
+                break;
+        }
+
+        return dialog;
+    }
+
+
+    private GLSurfaceView mGLView;
+
+    static {
+        System.loadLibrary("glmark2-android");
+    }
+}
+

=== added file 'android/src/org/linaro/glmark2/Glmark2Native.java'
--- android/src/org/linaro/glmark2/Glmark2Native.java	1970-01-01 00:00:00 +0000
+++ android/src/org/linaro/glmark2/Glmark2Native.java	2014-05-07 20:44:08 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2012 Linaro Limited
+ *
+ * This file is part of the glmark2 OpenGL (ES) 2.0 benchmark.
+ *
+ * glmark2 is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * glmark2 is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * glmark2.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *  Alexandros Frantzis
+ */
+package org.linaro.glmark2;
+
+import android.content.res.AssetManager;
+
+class Glmark2Native {
+    public static native void init(AssetManager assetManager, String args,
+                                   String logFilePath);
+    public static native void resize(int w, int h);
+    public static native boolean render();
+    public static native void done();
+    public static native int scoreConfig(GLVisualConfig vc, GLVisualConfig target);
+    public static native SceneInfo[] getSceneInfo(AssetManager assetManager);
+}

=== added file 'android/src/org/linaro/glmark2/Glmark2SurfaceView.java'
--- android/src/org/linaro/glmark2/Glmark2SurfaceView.java	1970-01-01 00:00:00 +0000
+++ android/src/org/linaro/glmark2/Glmark2SurfaceView.java	2014-05-07 20:44:08 +0000
@@ -0,0 +1,218 @@
+package org.linaro.glmark2;
+
+import java.io.File;
+
+import android.graphics.PixelFormat;
+import android.opengl.GLSurfaceView;
+import android.app.Activity;
+import android.util.Log;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGLDisplay;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+class Glmark2SurfaceView extends GLSurfaceView {
+
+    public static final String LOG_TAG = "glmark2";
+
+    public Glmark2SurfaceView(Activity activity) {
+        super(activity);
+        mActivity = activity;
+
+        setEGLContextClientVersion(2);
+
+        setEGLConfigChooser(getConfigChooser());
+
+        setRenderer(new Glmark2Renderer(this));
+    }
+
+    private EGLConfigChooser getConfigChooser() {
+        String args = mActivity.getIntent().getStringExtra("args");
+
+        if (args == null)
+            args = "";
+
+        String[] argv = args.split(" ");
+
+        /* Find the visual-config option argument */
+        String configString = new String();
+        boolean keepNext = false;
+        for (String arg : argv) {
+            if (keepNext) {
+                configString = arg;
+                break;
+            }
+
+            if (arg.equals("--visual-config"))
+                keepNext = true;
+        }
+
+        /* Parse the config string parameters */
+        String[] configParams = configString.split(":");
+        GLVisualConfig targetConfig = new GLVisualConfig(5, 6, 5, 0, 16, 0, 1);
+
+        for (String param : configParams) {
+            String[] paramKeyValue = param.split("=");
+            if (paramKeyValue.length < 2)
+                continue;
+
+            if (paramKeyValue[0].equals("red") || paramKeyValue[0].equals("r"))
+                targetConfig.red = Integer.parseInt(paramKeyValue[1]);
+            else if (paramKeyValue[0].equals("green") || paramKeyValue[0].equals("g"))
+                targetConfig.green = Integer.parseInt(paramKeyValue[1]);
+            else if (paramKeyValue[0].equals("blue") || paramKeyValue[0].equals("b"))
+                targetConfig.blue = Integer.parseInt(paramKeyValue[1]);
+            else if (paramKeyValue[0].equals("alpha") || paramKeyValue[0].equals("a"))
+                targetConfig.alpha = Integer.parseInt(paramKeyValue[1]);
+            else if (paramKeyValue[0].equals("depth") || paramKeyValue[0].equals("d"))
+                targetConfig.depth = Integer.parseInt(paramKeyValue[1]);
+            else if (paramKeyValue[0].equals("stencil") || paramKeyValue[0].equals("s"))
+                targetConfig.stencil = Integer.parseInt(paramKeyValue[1]);
+            else if (paramKeyValue[0].equals("buffer") || paramKeyValue[0].equals("buf"))
+                targetConfig.buffer = Integer.parseInt(paramKeyValue[1]);
+        }
+
+        return new Glmark2ConfigChooser(targetConfig);
+    }
+
+    /**
+     * EGLConfigChooser that quits with an error dialog when a suitable config
+     * cannot be found.
+     */
+    private class Glmark2ConfigChooser implements EGLConfigChooser {
+        private int[] mAttribList;
+
+        public Glmark2ConfigChooser(GLVisualConfig targetConfig)
+        {
+            mAttribList = new int[] {
+                    EGL10.EGL_RED_SIZE, targetConfig.red,
+                    EGL10.EGL_GREEN_SIZE, targetConfig.green,
+                    EGL10.EGL_BLUE_SIZE, targetConfig.blue,
+                    EGL10.EGL_ALPHA_SIZE, targetConfig.alpha,
+                    EGL10.EGL_DEPTH_SIZE, targetConfig.depth,
+                    EGL10.EGL_STENCIL_SIZE, targetConfig.stencil,
+                    EGL10.EGL_BUFFER_SIZE, targetConfig.buffer,
+                    EGL10.EGL_RENDERABLE_TYPE, 4, /* 4 = EGL_OPENGL_ES2_BIT */
+                    EGL10.EGL_NONE };
+
+            mTargetConfig = targetConfig;
+       }
+
+        @Override
+        public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display) {
+            try {
+                return chooseConfigInternal(egl, display);
+            }
+            catch (Exception e) {
+                /* Log an error message */
+                Log.e(LOG_TAG, "No suitable EGLConfig for GLES2.0 found. Please check that proper GLES2.0 drivers are installed.");
+                /* Display an informative (and lethal for the app) dialog */
+                mActivity.runOnUiThread(new Runnable() {
+                    public void run() {
+                        mActivity.showDialog(Glmark2Activity.DIALOG_EGLCONFIG_FAIL_ID);
+                    }
+                });
+
+                /* Wait here until the app process gets killed... */
+                synchronized (this) {
+                    try { this.wait(); } catch (Exception ex) { }
+                }
+            }
+            return null;
+        }
+
+        private EGLConfig chooseConfigInternal(EGL10 egl, EGLDisplay display) {
+            /* Get the number of available configs matching the attributes */
+            int[] num_config = new int[1];
+            if (!egl.eglChooseConfig(display, mAttribList, null, 0, num_config)) {
+                throw new IllegalArgumentException("eglChooseConfig failed");
+            }
+
+            int numConfigs = num_config[0];
+
+            if (numConfigs <= 0) {
+                throw new IllegalArgumentException("No matching configs found");
+            }
+
+            /* Get the matching configs */
+            EGLConfig[] configs = new EGLConfig[numConfigs];
+            if (!egl.eglChooseConfig(display, mAttribList, configs, numConfigs,
+                                     num_config))
+            {
+                throw new IllegalArgumentException("eglChooseConfig#2 failed");
+            }
+
+            /* Find the best matching config. */
+            int bestScore = Integer.MIN_VALUE;
+            EGLConfig bestConfig = configs[0];
+
+            for (EGLConfig config : configs) {
+                GLVisualConfig vc = new GLVisualConfig();
+                vc.red = findConfigAttrib(egl, display, config,
+                                          EGL10.EGL_RED_SIZE, 0);
+                vc.green = findConfigAttrib(egl, display, config,
+                                            EGL10.EGL_GREEN_SIZE, 0);
+                vc.blue = findConfigAttrib(egl, display, config,
+                                           EGL10.EGL_BLUE_SIZE, 0);
+                vc.alpha = findConfigAttrib(egl, display, config,
+                                            EGL10.EGL_ALPHA_SIZE, 0);
+                vc.depth = findConfigAttrib(egl, display, config,
+                                            EGL10.EGL_DEPTH_SIZE, 0);
+                vc.stencil = findConfigAttrib(egl, display, config,
+                                            EGL10.EGL_STENCIL_SIZE, 0);
+                vc.buffer = findConfigAttrib(egl, display, config,
+                                             EGL10.EGL_BUFFER_SIZE, 0);
+
+                int score = Glmark2Native.scoreConfig(vc, mTargetConfig);
+
+                if (score > bestScore) {
+                    bestScore = score;
+                    bestConfig = config;
+                }
+            }
+
+            return bestConfig;
+        }
+
+        private int findConfigAttrib(EGL10 egl, EGLDisplay display, EGLConfig config,
+                                     int attribute, int defaultValue)
+        {
+            int[] value = new int[] { defaultValue };
+            egl.eglGetConfigAttrib(display, config, attribute, value);
+            return value[0];
+        }
+
+        protected GLVisualConfig mTargetConfig;
+    }
+
+    public Activity getActivity() {
+        return mActivity;
+    }
+
+    private Activity mActivity;
+
+}
+
+class Glmark2Renderer implements GLSurfaceView.Renderer {
+    public Glmark2Renderer(Glmark2SurfaceView view) {
+        mView = view;
+    }
+
+    public void onDrawFrame(GL10 gl) {
+        if (!Glmark2Native.render())
+            mView.getActivity().finish();
+    }
+
+    public void onSurfaceChanged(GL10 gl, int width, int height) {
+        Glmark2Native.resize(width, height);
+    }
+
+    public void onSurfaceCreated(GL10 gl, EGLConfig config) {
+        String args = mView.getActivity().getIntent().getStringExtra("args");
+        File f = new File(mView.getActivity().getFilesDir(), "last_run.log");
+        Glmark2Native.init(mView.getActivity().getAssets(), args, f.getAbsolutePath());
+    }
+
+    private Glmark2SurfaceView mView;
+}

=== added file 'android/src/org/linaro/glmark2/MainActivity.java'
--- android/src/org/linaro/glmark2/MainActivity.java	1970-01-01 00:00:00 +0000
+++ android/src/org/linaro/glmark2/MainActivity.java	2014-05-07 20:44:08 +0000
@@ -0,0 +1,482 @@
+/*
+ * Copyright © 2012 Linaro Limited
+ *
+ * This file is part of the glmark2 OpenGL (ES) 2.0 benchmark.
+ *
+ * glmark2 is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * glmark2 is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * glmark2.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *  Alexandros Frantzis
+ */
+package org.linaro.glmark2;
+
+import java.util.ArrayList;
+
+import android.os.Bundle;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnDismissListener;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.widget.BaseAdapter;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.CheckBox;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.view.inputmethod.EditorInfo;
+import android.util.Log;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemLongClickListener;
+import android.widget.AdapterView;
+import android.widget.TextView.OnEditorActionListener;
+
+public class MainActivity extends Activity {
+    public static final int DIALOG_ERROR_ID = 0;
+    public static final int DIALOG_BENCHMARK_ACTIONS_ID = 1;
+    public static final int DIALOG_SAVE_LIST_ID = 2;
+    public static final int DIALOG_LOAD_LIST_ID = 3;
+    public static final int DIALOG_DELETE_LIST_ID = 4;
+
+    public static final int ACTIVITY_GLMARK2_REQUEST_CODE = 1;
+    public static final int ACTIVITY_EDITOR_REQUEST_CODE = 2;
+
+    /**
+     * The supported benchmark item actions.
+     */
+    public enum BenchmarkItemAction {
+        EDIT, DELETE, CLONE, MOVEUP, MOVEDOWN
+    }
+
+    BaseAdapter adapter;
+    SceneInfo[] sceneInfoList;
+    BenchmarkListManager benchmarkListManager;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        ArrayList<String> savedBenchmarks = null;
+
+        if (savedInstanceState != null)
+            savedBenchmarks = savedInstanceState.getStringArrayList("benchmarks");
+
+        init(savedBenchmarks);
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putStringArrayList("benchmarks", benchmarkListManager.getBenchmarkList());
+    }
+
+    @Override
+    protected Dialog onCreateDialog(int id, Bundle bundle) {
+        final CharSequence[] benchmarkActions = {"Delete", "Clone", "Move Up", "Move Down"};
+        final BenchmarkItemAction[] benchmarkActionsId = {
+                BenchmarkItemAction.DELETE, BenchmarkItemAction.CLONE,
+                BenchmarkItemAction.MOVEUP, BenchmarkItemAction.MOVEDOWN
+        };
+        final int finalId = id;
+
+        Dialog dialog;
+
+        switch (id) {
+            case DIALOG_ERROR_ID:
+                {
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                builder.setMessage(bundle.getString("message") + ": " +
+                                   bundle.getString("detail"));
+                builder.setCancelable(false);
+                builder.setPositiveButton("OK", null);
+                dialog = builder.create();
+                }
+                break;
+
+            case DIALOG_BENCHMARK_ACTIONS_ID:
+                {
+                final int benchmarkPos = bundle.getInt("benchmark-pos");
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                builder.setTitle("Pick an action");
+                builder.setItems(benchmarkActions, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int item) {
+                        doBenchmarkItemAction(benchmarkPos, benchmarkActionsId[item], null);
+                        dismissDialog(DIALOG_BENCHMARK_ACTIONS_ID);
+                    }
+                });
+                dialog = builder.create();
+                }
+                break;
+
+            case DIALOG_SAVE_LIST_ID:
+                {
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                View layout = getLayoutInflater().inflate(R.layout.save_dialog, null);
+                final EditText input = (EditText) layout.findViewById(R.id.listName);
+                final CheckBox checkBox = (CheckBox) layout.findViewById(R.id.external);
+
+                input.setOnEditorActionListener(new OnEditorActionListener() {
+                    public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                        if (actionId == EditorInfo.IME_ACTION_DONE ||
+                            (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER &&
+                             event.getAction() == KeyEvent.ACTION_UP))
+                        {
+                            String listName = v.getText().toString();
+                            try {
+                                benchmarkListManager.saveBenchmarkList(listName,
+                                                                       checkBox.isChecked());
+                            }
+                            catch (Exception ex) {
+                                Bundle bundle = new Bundle();
+                                bundle.putString("message", "Cannot save list to file " + listName);
+                                bundle.putString("detail", ex.getMessage());
+                                showDialog(DIALOG_ERROR_ID, bundle);
+                            }
+                            dismissDialog(DIALOG_SAVE_LIST_ID);
+                        }
+                        return true;
+                    }
+                });
+
+                builder.setTitle("Save list as");
+                builder.setView(layout);
+
+                dialog = builder.create();
+                dialog.getWindow().setSoftInputMode(
+                        WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN |
+                        WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
+                        );
+                }
+                break;
+
+            case DIALOG_LOAD_LIST_ID:
+            case DIALOG_DELETE_LIST_ID:
+                {
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                if (id == DIALOG_LOAD_LIST_ID)
+                    builder.setTitle("Load list");
+                else
+                    builder.setTitle("Delete list");
+                final String[] savedLists = benchmarkListManager.getSavedLists();
+
+                builder.setItems(savedLists, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int index) {
+                        String desc = savedLists[index];
+                        String filename = "";
+                        boolean external = false;
+
+                        if (desc.startsWith("internal/")) {
+                            filename = desc.replace("internal/", "");
+                            external = false;
+                        }
+                        else if (desc.startsWith("external/")) {
+                            filename = desc.replace("external/", "");
+                            external = true;
+                        }
+                            
+                        try {
+                            if (finalId == DIALOG_LOAD_LIST_ID) {
+                                benchmarkListManager.loadBenchmarkList(filename, external);
+                                adapter.notifyDataSetChanged();
+                            }
+                            else {
+                                benchmarkListManager.deleteBenchmarkList(filename, external);
+                            }
+
+                        }
+                        catch (Exception ex) {
+                            Bundle bundle = new Bundle();
+                            if (finalId == DIALOG_LOAD_LIST_ID)
+                                bundle.putString("message", "Cannot load list " + desc);
+                            else
+                                bundle.putString("message", "Cannot delete list " + desc);
+                            bundle.putString("detail", ex.getMessage());
+                            showDialog(DIALOG_ERROR_ID, bundle);
+                        }
+                        dismissDialog(finalId);
+                    }
+                });
+
+                dialog = builder.create();
+                }
+                break;
+
+            default:
+                dialog = null;
+                break;
+        }
+
+        if (dialog != null) {
+            dialog.setOnDismissListener(new OnDismissListener() {
+                public void onDismiss(DialogInterface dialog) {
+                    removeDialog(finalId);
+                }
+            });
+        }
+
+        return dialog;
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.main_options_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        boolean ret = true;
+
+        switch (item.getItemId()) {
+            case R.id.save_benchmark_list:
+                showDialog(DIALOG_SAVE_LIST_ID);
+                ret = true;
+                break;
+            case R.id.load_benchmark_list:
+                showDialog(DIALOG_LOAD_LIST_ID);
+                ret = true;
+                break;
+            case R.id.delete_benchmark_list:
+                showDialog(DIALOG_DELETE_LIST_ID);
+                ret = true;
+                break;
+            case R.id.settings:
+                startActivity(new Intent(MainActivity.this, MainPreferencesActivity.class));
+                ret = true;
+                break;
+            case R.id.results:
+                startActivity(new Intent(MainActivity.this, ResultsActivity.class));
+                ret = true;
+                break;
+            case R.id.about:
+                startActivity(new Intent(MainActivity.this, AboutActivity.class));
+                ret = true;
+                break;
+            default:
+                ret = super.onOptionsItemSelected(item);
+                break;
+        }
+
+        return ret;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == ACTIVITY_GLMARK2_REQUEST_CODE)
+        {
+            startActivity(new Intent(this, ResultsActivity.class));
+            return;
+        }
+        else if (requestCode == ACTIVITY_EDITOR_REQUEST_CODE &&
+                 resultCode == RESULT_OK)
+        {
+            String benchmarkText = data.getStringExtra("benchmark-text");
+            int benchmarkPos = data.getIntExtra("benchmark-pos", 0);
+            doBenchmarkItemAction(benchmarkPos, BenchmarkItemAction.EDIT, benchmarkText);
+        }
+    }
+
+    /**
+     * Initialize the activity.
+     *
+     * @param savedBenchmarks a list of benchmarks to load the list with (or null)
+     */
+    private void init(ArrayList<String> savedBenchmarks)
+    {
+        /* Initialize benchmark list manager */
+        benchmarkListManager = new BenchmarkListManager(this, savedBenchmarks);
+        final ArrayList<String> benchmarks = benchmarkListManager.getBenchmarkList();
+
+        /* Get Scene information */
+        sceneInfoList = Glmark2Native.getSceneInfo(getAssets());
+
+        /* Set up the run button */
+        Button button = (Button) findViewById(R.id.runButton);
+        button.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getBaseContext());
+                Intent intent = new Intent(MainActivity.this, Glmark2Activity.class);
+                String args = "";
+                for (int i = 0; i < benchmarks.size() - 1; i++)
+                    args += "-b \"" + benchmarks.get(i) + "\" ";
+                if (prefs.getBoolean("run_forever", false))
+                    args += "--run-forever ";
+                if (prefs.getBoolean("log_debug", false))
+                    args += "--debug ";
+                if (!args.isEmpty())
+                    intent.putExtra("args", args);
+                
+                if (prefs.getBoolean("show_results", true))
+                    startActivityForResult(intent, ACTIVITY_GLMARK2_REQUEST_CODE);
+                else
+                    startActivity(intent);
+            }
+        });
+
+        /* Set up the benchmark list view */
+        ListView lv = (ListView) findViewById(R.id.benchmarkListView);
+        adapter = new BenchmarkAdapter(this, R.layout.list_item, benchmarks);
+        lv.setAdapter(adapter);
+
+        lv.setOnItemClickListener(new OnItemClickListener() {
+            public void onItemClick(AdapterView<?> parentView, View childView, int position, long id) {
+                Intent intent = new Intent(MainActivity.this, EditorActivity.class);
+                String t = benchmarks.get(position);
+                if (position == benchmarks.size() - 1)
+                    t = "";
+                intent.putExtra("benchmark-text", t);
+                intent.putExtra("benchmark-pos", position);
+                intent.putExtra("scene-info", sceneInfoList);
+                startActivityForResult(intent, ACTIVITY_EDITOR_REQUEST_CODE);
+            }
+        });
+
+        lv.setOnItemLongClickListener(new OnItemLongClickListener() {
+            public boolean onItemLongClick(AdapterView<?> parentView, View childView, int position, long id) {
+                if (position < benchmarks.size() - 1) {
+                    Bundle bundle = new Bundle();
+                    bundle.putInt("benchmark-pos", position);
+                    showDialog(DIALOG_BENCHMARK_ACTIONS_ID, bundle);
+                }
+                return true;
+            }
+        });
+
+    }
+
+    /**
+     * Perform an action on an listview benchmark item.
+     *
+     * @param position the position of the item in the listview
+     * @param action the action to perform
+     * @param data extra data needed by some actions
+     */
+    private void doBenchmarkItemAction(int position, BenchmarkItemAction action, String data)
+    {
+        int scrollPosition = position;
+        final ArrayList<String> benchmarks = benchmarkListManager.getBenchmarkList();
+
+        switch(action) {
+            case EDIT:
+                if (position == benchmarks.size() - 1) {
+                    benchmarks.add(position, data);
+                    scrollPosition = position + 1;
+                }
+                else {
+                    benchmarks.set(position, data);
+                }
+                break;
+            case DELETE:
+                benchmarks.remove(position);
+                break;
+            case CLONE:
+                {
+                    String s = benchmarks.get(position);
+                    benchmarks.add(position, s);
+                    scrollPosition = position + 1;
+                }
+                break;
+            case MOVEUP:
+                if (position > 0) {
+                    String up = benchmarks.get(position - 1);
+                    String s = benchmarks.get(position);
+                    benchmarks.set(position - 1, s);
+                    benchmarks.set(position, up);
+                    scrollPosition = position - 1;
+                }
+                break;
+            case MOVEDOWN:
+                if (position < benchmarks.size() - 2) {
+                    String down = benchmarks.get(position + 1);
+                    String s = benchmarks.get(position);
+                    benchmarks.set(position + 1, s);
+                    benchmarks.set(position, down);
+                    scrollPosition = position + 1;
+                }
+                break;
+            default:
+                break;
+        }
+
+
+        adapter.notifyDataSetChanged();
+
+        /* Scroll the list view so that the item of interest remains visible */
+        final int finalScrollPosition = scrollPosition;
+        final ListView lv = (ListView) findViewById(R.id.benchmarkListView);
+        lv.post(new Runnable() {
+            @Override
+            public void run() {
+                lv.smoothScrollToPosition(finalScrollPosition);
+            }
+        });
+    }
+
+    /**
+     * A ListView adapter that creates item views from benchmark strings.
+     */
+    private class BenchmarkAdapter extends ArrayAdapter<String> {
+        private ArrayList<String> items;
+
+        public BenchmarkAdapter(Context context, int textViewResourceId, ArrayList<String> items) {
+            super(context, textViewResourceId, items);
+            this.items = items;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            /* Get the view/widget to use */
+            View v = convertView;
+            if (v == null) {
+                LayoutInflater vi = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                v = vi.inflate(R.layout.list_item, null);
+            }
+
+            /* Split the benchmark into its scene name and its options */
+            String benchmark = items.get(position);
+            String[] ba = benchmark.split(":", 2);
+
+            if (ba != null) {
+                TextView title = (TextView) v.findViewById(R.id.title);
+                TextView summary = (TextView) v.findViewById(R.id.summary);
+                title.setText("");
+                summary.setText("");
+
+                if (title != null && ba.length > 0)
+                    title.setText(ba[0]);
+                if (summary != null && ba.length > 1)
+                    summary.setText(ba[1]);
+            }
+            return v;
+        }
+    }
+
+    static {
+        System.loadLibrary("glmark2-android");
+    }
+}

=== added file 'android/src/org/linaro/glmark2/MainPreferencesActivity.java'
--- android/src/org/linaro/glmark2/MainPreferencesActivity.java	1970-01-01 00:00:00 +0000
+++ android/src/org/linaro/glmark2/MainPreferencesActivity.java	2014-05-07 20:44:08 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2012 Linaro Limited
+ *
+ * This file is part of the glmark2 OpenGL (ES) 2.0 benchmark.
+ *
+ * glmark2 is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * glmark2 is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * glmark2.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *  Alexandros Frantzis
+ */
+package org.linaro.glmark2;
+ 
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+ 
+public class MainPreferencesActivity extends PreferenceActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.preferences);
+    }
+}

=== added file 'android/src/org/linaro/glmark2/ResultsActivity.java'
--- android/src/org/linaro/glmark2/ResultsActivity.java	1970-01-01 00:00:00 +0000
+++ android/src/org/linaro/glmark2/ResultsActivity.java	2014-05-07 20:44:08 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2012 Linaro Limited
+ *
+ * This file is part of the glmark2 OpenGL (ES) 2.0 benchmark.
+ *
+ * glmark2 is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * glmark2 is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * glmark2.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *  Alexandros Frantzis
+ */
+package org.linaro.glmark2;
+
+import java.io.*;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.TextView;
+
+public class ResultsActivity extends Activity {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_results);
+        TextView tv = (TextView) findViewById(R.id.results);
+
+        File f = new File(getFilesDir(), "last_run.log");
+
+        try {
+            /* Read log from file */
+            BufferedReader reader = new BufferedReader(new FileReader(f));
+            String line = null;
+            StringBuffer sb = new StringBuffer();
+
+            while ((line = reader.readLine()) != null) {
+                sb.append(line);
+                sb.append('\n');
+            }
+
+            reader.close();
+            tv.setText(sb.toString());
+        }
+        catch (Exception ex) {
+        }
+    }
+}
+

=== added file 'android/src/org/linaro/glmark2/SceneInfo.java'
--- android/src/org/linaro/glmark2/SceneInfo.java	1970-01-01 00:00:00 +0000
+++ android/src/org/linaro/glmark2/SceneInfo.java	2014-05-07 20:44:08 +0000
@@ -0,0 +1,96 @@
+/*
+ * Copyright © 2012 Linaro Limited
+ *
+ * This file is part of the glmark2 OpenGL (ES) 2.0 benchmark.
+ *
+ * glmark2 is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * glmark2 is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * glmark2.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *  Alexandros Frantzis
+ */
+package org.linaro.glmark2;
+
+import android.os.Parcelable;
+import android.os.Parcel;
+import java.util.ArrayList;
+
+class SceneInfo implements Parcelable {
+    static class Option {
+        String name;
+        String description;
+        String defaultValue;
+        String[] acceptableValues;
+    }
+
+    public SceneInfo(String name) {
+        this.name = name;
+        this.options = new ArrayList<Option>();
+    }
+
+    public void addOption(String name, String description, String defaultValue,
+                          String[] acceptableValues)
+    {
+        Option opt = new Option();
+        opt.name = name;
+        opt.description = description;
+        opt.defaultValue = defaultValue;
+        opt.acceptableValues = acceptableValues;
+        this.options.add(opt);
+    }
+
+    public String name;
+    public ArrayList<Option> options;
+
+    /* Parcelable interface */
+    public static final Parcelable.Creator<SceneInfo> CREATOR =
+        new Parcelable.Creator<SceneInfo>() {
+            public SceneInfo createFromParcel(Parcel in) {
+                return new SceneInfo(in);
+            }
+
+            public SceneInfo[] newArray(int size) {
+                return new SceneInfo[size];
+            }
+        };
+
+    public int describeContents() {
+        return 0;
+    }
+
+    public void writeToParcel(Parcel out, int flags) {
+        out.writeString(name);
+        out.writeInt(options.size());
+        for (Option opt: options) {
+            out.writeString(opt.name);
+            out.writeString(opt.description);
+            out.writeString(opt.defaultValue);
+            out.writeStringArray(opt.acceptableValues);
+        }
+    }
+
+    private SceneInfo(Parcel in) {
+        name = in.readString();
+        options = new ArrayList<Option>();
+
+        int size = in.readInt();
+        for (int i = 0; i < size; i++) {
+            Option opt = new Option();
+            opt.name = in.readString();
+            opt.description = in.readString();
+            opt.defaultValue = in.readString();
+            opt.acceptableValues = in.createStringArray();
+            options.add(opt);
+        }
+    }
+}

=== added directory 'data'
=== renamed directory 'data' => 'data.moved'
=== added directory 'data/models'
=== added file 'data/models/asteroid-high.3ds'
Binary files data/models/asteroid-high.3ds	1970-01-01 00:00:00 +0000 and data/models/asteroid-high.3ds	2014-05-07 20:44:08 +0000 differ
=== added file 'data/models/asteroid-low.3ds'
Binary files data/models/asteroid-low.3ds	1970-01-01 00:00:00 +0000 and data/models/asteroid-low.3ds	2014-05-07 20:44:08 +0000 differ
=== added file 'data/models/bunny.obj'
--- data/models/bunny.obj	1970-01-01 00:00:00 +0000
+++ data/models/bunny.obj	2014-05-07 20:44:08 +0000
@@ -0,0 +1,104501 @@
+v 0.296502 -0.907931 0.450151
+v 0.315114 -0.913622 0.435867
+v 0.324517 -0.920404 0.443869
+v 0.325879 -0.966814 0.485578
+v 0.302693 -0.969589 0.506426
+v 0.29049 -0.968073 0.502572
+v 0.278223 -0.96657 0.498757
+v 0.256232 -0.967238 0.517897
+v 0.242885 -0.967829 0.515687
+v 0.220907 -0.96851 0.534853
+v 0.208062 -0.96806 0.53186
+v 0.197002 -0.964438 0.526298
+v 0.173341 -0.968279 0.547929
+v 0.161099 -0.966776 0.544075
+v 0.126289 -0.967007 0.560171
+v 0.112326 -0.968664 0.558732
+v 0.11889 -0.907418 0.505655
+v 0.10178 -0.963988 0.552425
+v 0.07826 -0.967765 0.573838
+v 0.0649908 -0.96824 0.571474
+v 0.0538154 -0.964656 0.566002
+v 0.0307452 -0.967842 0.586503
+v 0.0174889 -0.968317 0.584114
+v 0.00474634 -0.967778 0.58089
+v -0.0167567 -0.96797 0.599079
+v -0.0294992 -0.967431 0.595893
+v -0.00351319 -0.909242 0.528122
+v 0.0103597 -0.907585 0.529509
+v -0.0427042 -0.967906 0.593491
+v -0.0436933 -0.911066 0.521442
+v -0.13451 -0.969229 0.575058
+v -0.166648 -0.971927 0.547929
+v -0.124323 -0.915574 0.508661
+v -0.147766 -0.969704 0.572605
+v -0.160496 -0.969178 0.569458
+v -0.179365 -0.971374 0.544808
+v -0.192622 -0.97185 0.54238
+v -0.198222 -0.973596 0.520093
+v -0.210425 -0.972042 0.516175
+v -0.216 -0.973802 0.493915
+v -0.228165 -0.972248 0.49001
+v -0.231145 -0.968959 0.463908
+v -0.201472 -0.937116 0.442687
+v -0.18169 -0.924373 0.435802
+v -0.176295 -0.922665 0.458282
+v -0.162975 -0.92219 0.460709
+v -0.156937 -0.919364 0.482264
+v -0.144169 -0.91989 0.485462
+v -0.12923 -0.916255 0.485449
+v -0.121806 -0.969769 0.57818
+v -0.11054 -0.914084 0.510318
+v -0.0936743 -0.965761 0.580762
+v -0.107483 -0.967251 0.579092
+v -0.097104 -0.91348 0.512553
+v -0.0814841 -0.967315 0.584692
+v -0.0704243 -0.912273 0.516998
+v -0.0303213 -0.910462 0.523664
+v -0.0169494 -0.909858 0.525886
+v -0.0687031 -0.967855 0.587878
+v -0.0570524 -0.911669 0.51922
+v 0.0237188 -0.906981 0.531731
+v 0.0440016 -0.90946 0.515084
+v 0.0712978 -0.907199 0.518706
+v 0.0921457 -0.908625 0.501211
+v 0.105518 -0.908021 0.503433
+v 0.139738 -0.908856 0.488147
+v 0.152596 -0.909306 0.491191
+v 0.166481 -0.907649 0.492579
+v 0.187355 -0.909087 0.475058
+v 0.200714 -0.908497 0.477254
+v 0.214651 -0.906827 0.478641
+v 0.235512 -0.908278 0.461095
+v 0.248884 -0.907674 0.463304
+v 0.262256 -0.907084 0.465514
+v 0.283759 -0.907482 0.447119
+v 0.331685 -0.931477 0.455212
+v 0.148858 -0.96526 0.540209
+v 0.0579259 -0.907803 0.516484
+v -0.0559734 -0.968394 0.591102
+v -0.0832311 -0.911811 0.51394
+v -0.407922 -0.953686 0.138626
+v -0.458918 -0.98404 0.178575
+v -0.428115 -0.966955 0.146449
+v -0.46719 -0.983552 0.19941
+v -0.475205 -0.991233 0.250329
+v -0.477569 -0.987084 0.223315
+v -0.463028 -0.985555 0.293451
+v -0.469117 -0.988381 0.271896
+v -0.457453 -0.983731 0.315763
+v -0.439149 -0.982485 0.341261
+v -0.452379 -0.982948 0.338833
+v -0.420266 -0.98025 0.365924
+v -0.433021 -0.979698 0.362751
+v -0.407523 -0.980803 0.369084
+v -0.381576 -0.980918 0.374595
+v -0.346791 -0.980366 0.358731
+v -0.368281 -0.980443 0.377048
+v -0.333509 -0.979916 0.36112
+v -0.306418 -0.978015 0.365115
+v -0.321845 -0.982485 0.365796
+v -0.275397 -0.959865 0.332924
+v -0.247163 -0.963513 0.295866
+v -0.254652 -0.961471 0.315596
+v -0.243309 -0.963963 0.250869
+v -0.257696 -0.949781 0.188877
+v -0.24241 -0.953917 0.218884
+v -0.24715 -0.954457 0.195236
+v -0.276386 -0.951965 0.163867
+v -0.265814 -0.956654 0.170264
+v -0.287497 -0.948343 0.158344
+v -0.310169 -0.957925 0.139166
+v -0.297863 -0.959428 0.143071
+v -0.334652 -0.954881 0.131459
+v -0.322411 -0.956409 0.135312
+v -0.360844 -0.955022 0.126244
+v -0.346894 -0.953365 0.127592
+v -0.388744 -0.958323 0.123533
+v -0.374228 -0.955613 0.12406
+v -0.394254 -0.980366 0.37146
+v -0.24855 -0.957681 0.267259
+v 0.367279 -0.961702 0.0687223
+v 0.33744 -0.952145 0.0779067
+v 0.353329 -0.963333 0.0673993
+v 0.317568 -0.94833 0.0942716
+v 0.279482 -0.978259 0.137496
+v 0.296206 -0.963654 0.103867
+v 0.282475 -0.980841 0.163803
+v 0.292455 -0.978619 0.210509
+v 0.31225 -0.97429 0.233951
+v 0.300008 -0.972787 0.230136
+v 0.333252 -0.967855 0.255737
+v 0.32042 -0.967392 0.252693
+v 0.345995 -0.968317 0.25873
+v 0.36358 -0.968214 0.285525
+v 0.351274 -0.966686 0.281646
+v 0.37577 -0.96973 0.289417
+v 0.400304 -0.972749 0.297112
+v 0.386894 -0.97334 0.294941
+v 0.427074 -0.971567 0.301505
+v 0.459868 -0.950912 0.266193
+v 0.440985 -0.969923 0.302866
+v 0.491801 -0.948214 0.223482
+v 0.481936 -0.950308 0.246758
+v 0.502771 -0.951965 0.158858
+v 0.484762 -0.953339 0.132589
+v 0.494769 -0.959068 0.13986
+v 0.467896 -0.95262 0.104625
+v 0.479033 -0.956255 0.1102
+v 0.45735 -0.947944 0.0982537
+v 0.437068 -0.953545 0.0753377
+v 0.447639 -0.958208 0.0817603
+v 0.425391 -0.950976 0.0706491
+v 0.381807 -0.959017 0.0692105
+v 0.286033 -0.98237 0.18925
+v 0.413651 -0.972171 0.29927
+v 0.502168 -0.945041 0.19932
+v 0.506895 -0.952415 0.183572
+v 0.396335 -0.956332 0.0696857
+v 0.41315 -0.949447 0.0667955
+v -0.31681 -0.977553 -0.0308544
+v -0.32146 -0.978195 -0.054798
+v -0.293252 -0.950295 -0.0745413
+v -0.272661 -0.920173 -0.0741302
+v -0.262115 -0.924849 -0.0677333
+v -0.256334 -0.922074 -0.0454467
+v -0.243502 -0.922536 -0.0424152
+v -0.239443 -0.922922 -0.0176237
+v -0.226572 -0.923384 -0.0145794
+v -0.221922 -0.922806 0.00914585
+v -0.209667 -0.924335 0.0129994
+v -0.195679 -0.922691 0.0143354
+v -0.192146 -0.924219 0.0397562
+v -0.179288 -0.924682 0.0428134
+v -0.175178 -0.92517 0.0673607
+v -0.161767 -0.924579 0.0695444
+v -0.158222 -0.926133 0.0949396
+v -0.145351 -0.926583 0.0979582
+v -0.140662 -0.92603 0.121709
+v -0.128716 -0.928587 0.196122
+v -0.172981 -0.978285 0.208646
+v -0.176604 -0.976718 0.183277
+v -0.125107 -0.930141 0.221479
+v -0.15442 -0.960276 0.242609
+v -0.166507 -0.974534 0.229802
+v -0.181909 -0.978324 0.160438
+v -0.196385 -0.981021 0.159962
+v -0.201138 -0.981573 0.136301
+v -0.213958 -0.981111 0.133283
+v -0.218132 -0.98061 0.108697
+v -0.232082 -0.982254 0.1074
+v -0.236244 -0.981753 0.082865
+v -0.249642 -0.982344 0.0806428
+v -0.262988 -0.982935 0.0784719
+v -0.267176 -0.982434 0.0539246
+v -0.280522 -0.983025 0.0517794
+v -0.282436 -0.978324 0.0238409
+v -0.296347 -0.979955 0.0225178
+v -0.297067 -0.973198 -0.00728328
+v -0.313817 -0.980083 -0.00440594
+v -0.132904 -0.928086 0.171626
+v -0.137066 -0.927585 0.147092
+v -0.96948 0.285294 0.25381
+v -0.967758 0.285089 0.240991
+v -0.975298 0.26767 0.241081
+v -0.903378 0.00303149 0.255609
+v -0.926409 0.0219269 0.255275
+v -0.90691 0.00385359 0.242494
+v -0.91201 -0.0659092 0.204292
+v -0.904264 -0.0487993 0.204189
+v -0.904444 -0.048825 0.191408
+v -0.912074 -0.0659478 0.191485
+v -0.19004 -0.758386 -0.151934
+v -0.196514 -0.75768 -0.139847
+v -0.193457 -0.739902 -0.140258
+v -0.922646 0.408288 0.176417
+v -0.930533 0.40848 0.189853
+v -0.923802 0.425912 0.175814
+v -0.231684 -0.0572772 -0.242892
+v -0.231697 -0.0388442 -0.239963
+v -0.218826 -0.0571744 -0.244433
+v -0.205416 -0.220759 -0.289559
+v -0.218248 -0.220926 -0.288043
+v -0.205531 -0.202455 -0.286669
+v -0.888901 -0.0132307 0.152808
+v -0.887899 -0.0147336 0.139898
+v -0.890712 -0.0321132 0.140014
+v -0.898419 -0.0492489 0.152936
+v -0.896724 -0.0494544 0.140129
+v -0.9042 -0.0666157 0.140283
+v -0.900783 0.495828 0.125704
+v -0.89034 0.49588 0.112358
+v -0.890507 0.478397 0.112409
+v -0.903802 0.478423 0.125845
+v -0.00767507 0.22514 0.0800262
+v 0.00830448 0.230368 0.0858965
+v 0.0138408 0.229109 0.0692875
+v 0.0307581 0.234748 0.0755946
+v 0.0244767 0.228094 0.0534236
+v -0.0131985 0.226463 0.0966095
+v 0.00366733 0.232474 0.102788
+v 0.0451576 0.245217 0.136597
+v 0.0382083 0.244086 0.152666
+v 0.0544191 0.248634 0.158537
+v 0.0320169 0.243971 0.168941
+v 0.0259282 0.24347 0.185293
+v 0.0412784 0.247156 0.190894
+v 0.0605078 0.249006 0.142223
+v 0.066635 0.249237 0.125948
+v 0.0512463 0.245538 0.120296
+v 0.0490883 0.249135 0.17512
+v -0.019467 0.226642 0.112962
+v -0.00338474 0.231575 0.118845
+v 0.0728264 0.249327 0.109686
+v -0.0256199 0.226283 0.129352
+v -0.00948625 0.231203 0.135235
+v -0.0325821 0.225101 0.14546
+v -0.0155621 0.230573 0.151587
+v -0.0378872 0.22573 0.162121
+v -0.0224728 0.229327 0.167721
+v -0.0447851 0.224292 0.178254
+v -0.0286001 0.228852 0.184124
+v -0.0524666 0.221543 0.194311
+v -0.036243 0.226052 0.200117
+v 0.0933018 0.242018 0.0430189
+v 0.0892299 0.245705 0.060116
+v 0.109397 0.246758 0.0490177
+v 0.0684719 0.24302 0.0709831
+v 0.0628842 0.244613 0.0874508
+v 0.0844899 0.248081 0.0769048
+v -0.66416 0.775509 -0.402854
+v -0.670338 0.774854 -0.386926
+v -0.65405 0.768226 -0.399219
+v -0.824764 0.572194 0.30487
+v -0.834668 0.565848 0.320709
+v -0.818689 0.570973 0.326129
+v -0.647885 0.768573 -0.415327
+v -0.657865 0.775933 -0.419039
+v -0.402488 0.326412 0.254491
+v -0.397517 0.32392 0.237278
+v -0.399893 0.326142 0.243084
+v -0.660447 0.767596 -0.383175
+v 0.0566285 0.24478 0.1037
+v -0.794244 0.584281 0.24013
+v -0.801206 0.582791 0.256546
+v -0.785625 0.58599 0.261864
+v 0.0790307 0.249186 0.0934495
+v -0.0606362 0.216854 0.210188
+v -0.0445796 0.221825 0.215981
+v -0.966898 0.0749523 0.152281
+v -0.972986 0.092332 0.152165
+v -0.968632 0.0921779 0.139282
+v -0.0696665 0.211318 0.225769
+v -0.0526978 0.217073 0.231703
+v -0.0785426 0.205345 0.241312
+v -0.0623318 0.209982 0.247028
+v -0.0891399 0.197612 0.256623
+v -0.0728007 0.201838 0.26225
+v -0.099429 0.188929 0.271755
+v -0.0848625 0.191382 0.277266
+v -0.109782 0.180451 0.286938
+v -0.0957296 0.181337 0.292051
+v -0.121639 0.169532 0.301762
+v -0.107534 0.172782 0.306579
+v -0.915838 -0.134824 0.307067
+v -0.910455 -0.117586 0.307195
+v -0.915735 -0.117624 0.294119
+v -0.235114 -0.303098 -0.294697
+v -0.243309 -0.294864 -0.289816
+v -0.231016 -0.294427 -0.29575
+v -0.763698 0.583575 0.157124
+v -0.769992 0.583755 0.17363
+v -0.748939 0.585951 0.162287
+v -0.677095 0.773197 -0.371036
+v -0.667165 0.766042 -0.367311
+v -0.0664551 -0.915356 0.711617
+v -0.0798271 -0.915895 0.714173
+v -0.0795317 -0.933956 0.715393
+v -0.691636 0.58369 0.089095
+v -0.67829 0.582765 0.0939248
+v -0.672766 0.581532 0.0771874
+v 0.176475 0.259192 0.0555559
+v 0.191915 0.262314 0.0613363
+v 0.196488 0.258486 0.0436997
+v -0.842196 -0.453092 0.129301
+v -0.844084 -0.453259 0.116455
+v -0.83427 -0.471063 0.116558
+v -0.919588 -0.291383 0.128646
+v -0.919563 -0.291473 0.115813
+v -0.912164 -0.309032 0.115813
+v 0.478584 -0.226565 -0.287863
+v 0.490055 -0.23056 -0.283419
+v 0.476952 -0.242815 -0.296508
+v -0.562695 -0.856653 0.573799
+v -0.551494 -0.85664 0.58089
+v -0.555977 -0.840211 0.566542
+v -0.924816 -0.204626 0.14099
+v -0.925228 -0.204574 0.15372
+v -0.928053 -0.187105 0.14081
+v -0.794128 0.582316 0.277869
+v -0.80971 0.578783 0.272513
+v -0.801746 0.57922 0.29408
+v -0.465122 0.537357 0.245756
+v -0.469708 0.540068 0.262622
+v -0.463028 0.526863 0.265435
+v 0.986243 -0.525899 0.188659
+v 0.985125 -0.525771 0.175711
+v 0.978304 -0.513388 0.180528
+v -0.702619 0.863165 -0.583189
+v -0.692728 0.855664 -0.579593
+v -0.68416 0.860802 -0.595187
+v -0.96271 0.0746954 0.139397
+v -0.758945 0.581481 0.140065
+v -0.743338 0.584358 0.145576
+v -0.131979 0.160913 0.316996
+v -0.116603 0.164779 0.322571
+v -0.868092 -0.415879 0.180528
+v -0.884996 -0.397318 0.180425
+v -0.883557 -0.397575 0.167593
+v -0.14449 0.148838 0.331756
+v -0.127637 0.154786 0.337562
+v -0.153508 0.143058 0.34744
+v -0.1402 0.142583 0.352308
+v -0.163912 0.135633 0.363252
+v -0.150695 0.134567 0.367838
+v -0.847308 -0.435481 0.167747
+v -0.846691 -0.434993 0.180605
+v -0.868015 -0.415918 0.167644
+v -0.31803 0.767892 0.0363393
+v -0.332571 0.766286 0.0310471
+v -0.331903 0.7524 0.0499168
+v -0.925626 0.337061 0.12519
+v -0.922864 0.336984 0.112332
+v -0.935632 0.319308 0.112473
+v 0.0731861 0.240721 0.0541558
+v -0.933898 -0.256032 0.205332
+v -0.934707 -0.25593 0.192512
+v -0.929916 -0.273232 0.192628
+v -0.174484 0.127374 0.378795
+v -0.161061 0.125987 0.38315
+v -0.0610987 0.180566 0.323355
+v -0.0724025 0.171266 0.338422
+v -0.0568597 0.174465 0.343881
+v -0.660036 0.420157 -0.131973
+v -0.644802 0.428994 -0.151703
+v -0.634461 0.427954 -0.144214
+v -0.173623 0.114567 0.398667
+v -0.710608 0.473709 -0.286861
+v -0.698354 0.468365 -0.288929
+v -0.713242 0.474814 -0.273926
+v -0.0109635 0.671565 -0.179282
+v 0.000982665 0.668778 -0.174388
+v -0.0100001 0.656806 -0.160785
+v -0.491146 0.566118 0.234504
+v -0.501487 0.573684 0.23196
+v -0.496529 0.56807 0.252307
+v -0.877083 -0.0157612 0.0886326
+v -0.870815 -0.0158254 0.0758515
+v -0.876518 -0.0332308 0.0760185
+v -0.635579 0.513979 -0.438384
+v -0.642528 0.512065 -0.450806
+v -0.626228 0.527274 -0.450433
+v -0.545726 -0.840224 0.574403
+v -0.53405 -0.824334 0.562277
+v -0.545276 -0.824154 0.555418
+v -0.679214 0.584063 0.056044
+v -0.667268 0.580376 0.0604243
+v -0.661681 0.579618 0.0437511
+v -0.929055 -0.204227 0.179449
+v -0.930712 -0.204099 0.192281
+v -0.931149 -0.186758 0.17932
+v -0.919537 -0.13458 0.294491
+v -0.444081 0.314774 0.390754
+v -0.449618 0.30514 0.408802
+v -0.441743 0.304973 0.397549
+v 0.0323766 0.234851 0.281042
+v 0.0235647 0.228813 0.296508
+v 0.0389148 0.232474 0.302109
+v -0.950623 0.355828 0.266296
+v -0.950379 0.355802 0.253515
+v -0.95043 0.338075 0.253566
+v -0.878278 -0.379733 0.282776
+v -0.88339 -0.362302 0.282841
+v -0.883044 -0.379553 0.26997
+v -0.9042 -0.100566 0.307054
+v -0.908644 -0.100463 0.294183
+v 0.147188 0.262596 0.266424
+v 0.132403 0.260695 0.261094
+v 0.139596 0.259873 0.282314
+v -0.439084 -0.751668 0.284716
+v -0.439406 -0.733685 0.284536
+v -0.436002 -0.734057 0.271781
+v -0.479663 0.541249 0.333528
+v -0.487498 0.552785 0.330432
+v -0.484801 0.543523 0.350291
+v -0.493073 0.553928 0.347054
+v -0.498571 0.55502 0.363715
+v -0.490568 0.543574 0.366875
+v -0.533857 0.563819 0.388185
+v -0.541449 0.560903 0.404216
+v -0.529258 0.557255 0.40902
+v -0.883159 0.425141 0.112114
+v -0.891483 0.425385 0.124561
+v -0.883493 0.442932 0.111883
+v -0.526985 0.565386 0.371961
+v -0.522219 0.559477 0.392501
+v -0.867835 -0.415854 0.154812
+v -0.881798 -0.397639 0.154747
+v -0.897186 0.44324 0.124908
+v -0.903956 0.461108 0.125704
+v -0.887783 0.460748 0.112139
+v 0.413972 -0.964348 0.0566735
+v -0.899537 0.00380221 0.140065
+v 0.0233078 0.970334 -0.277805
+v 0.0153437 0.984297 -0.280451
+v 0.0174503 0.970437 -0.261787
+v -0.81522 -0.491089 0.2446
+v -0.819113 -0.489226 0.232333
+v -0.810981 -0.502033 0.230188
+v -0.463311 -0.696048 0.181864
+v -0.474114 -0.695136 0.169006
+v -0.471198 -0.700711 0.170277
+v -0.540061 -0.813159 0.413773
+v -0.506111 -0.798528 0.413657
+v -0.5308 -0.814135 0.400953
+v -0.896313 -0.0836614 0.306861
+v -0.900796 -0.08361 0.294003
+v -0.606549 0.769947 -0.567364
+v -0.613446 0.783949 -0.569638
+v -0.611764 0.772131 -0.550408
+v -0.393805 0.66942 0.102917
+v -0.39374 0.688431 0.0894675
+v -0.408641 0.675727 0.0968022
+v -0.608629 0.842061 -0.660505
+v -0.602271 0.827944 -0.658296
+v -0.595437 0.829575 -0.674417
+v -0.71933 0.590331 0.172679
+v -0.724867 0.59141 0.18943
+v -0.7052 0.590755 0.177702
+v -0.716427 0.773878 -0.348609
+v -0.726755 0.765618 -0.333926
+v -0.712676 0.766582 -0.328583
+v -0.73802 0.840031 -0.52256
+v -0.748168 0.831849 -0.508044
+v -0.735618 0.829999 -0.50315
+v -0.727012 0.836871 -0.51764
+v -0.928156 0.0228775 0.165653
+v -0.948991 0.04027 0.165435
+v -0.943648 0.0396277 0.152435
+v -0.755002 0.800506 -0.45534
+v -0.766228 0.788766 -0.441583
+v -0.750596 0.794289 -0.435199
+v -0.630428 0.629265 -0.13187
+v -0.6373 0.627634 -0.115826
+v -0.621989 0.618951 -0.128736
+v -0.64407 0.626157 -0.0996795
+v -0.636221 0.614583 -0.0967379
+v -0.628681 0.617538 -0.112602
+v -0.734976 0.747519 -0.299604
+v -0.746254 0.735535 -0.285872
+v -0.730352 0.741071 -0.279488
+v -0.718521 0.751912 -0.293785
+v -0.691803 0.767738 -0.339681
+v -0.70371 0.771283 -0.344061
+v -0.699895 0.764437 -0.323894
+v -0.466381 0.656228 0.0952222
+v -0.481769 0.652965 0.085524
+v -0.48263 0.63782 0.108902
+v 0.0860314 0.256521 0.170085
+v 0.0798913 0.256277 0.18636
+v 0.0945992 0.258332 0.191716
+v -0.722503 0.759504 -0.313644
+v -0.708746 0.758142 -0.309006
+v -0.149847 0.0833274 0.43579
+v -0.162243 0.094824 0.421788
+v -0.162628 0.0830448 0.435494
+v 0.100714 0.258781 0.175467
+v -0.044464 0.186963 0.329392
+v 0.00704565 0.192268 0.366605
+v -0.00908805 0.187477 0.360799
+v -0.00523446 0.179526 0.380889
+v -0.021792 0.17548 0.375442
+v -0.0835522 0.161825 0.353593
+v -0.0679709 0.164959 0.359
+v -0.742246 0.727789 -0.265846
+v -0.121716 0.188479 0.0380735
+v -0.136411 0.186218 0.0327041
+v -0.141998 0.188492 0.0492103
+v -0.654898 0.525835 -0.541172
+v -0.665303 0.527055 -0.548597
+v -0.642464 0.536599 -0.556934
+v -0.727423 0.581134 0.0573928
+v -0.735194 0.578604 0.0735393
+v -0.719073 0.583305 0.0792426
+v -0.936891 -0.238499 0.205281
+v -0.740808 0.580004 0.0902896
+v -0.747115 0.580158 0.106783
+v -0.732355 0.582611 0.111998
+v -0.953205 0.373503 0.253412
+v -0.95946 0.391114 0.253296
+v -0.959203 0.391075 0.240528
+v -0.951201 0.373027 0.239899
+v -0.9163 0.537011 0.198588
+v -0.924071 0.530755 0.188774
+v -0.929698 0.530549 0.201607
+v -0.164709 0.899428 -0.0916512
+v -0.183001 0.88955 -0.0986005
+v -0.176244 0.88946 -0.0773158
+v -0.886114 -0.0664744 0.306926
+v -0.890866 -0.0662817 0.294183
+v -0.639137 0.907559 -0.72775
+v -0.644776 0.908728 -0.711
+v -0.627936 0.902999 -0.723537
+v -0.886871 -0.344858 0.282841
+v -0.887591 -0.361955 0.26988
+v 0.968568 -0.525437 0.27146
+v 0.964264 -0.53281 0.287696
+v 0.975735 -0.54992 0.281787
+v -0.141677 -0.0918567 -0.280246
+v -0.14169 -0.0736935 -0.275249
+v -0.128909 -0.0734879 -0.277035
+v -0.128755 -0.11011 -0.283534
+v -0.141549 -0.110315 -0.281466
+v -0.128845 -0.0916897 -0.282006
+v -0.898137 -0.0314324 0.204137
+v -0.89725 -0.0315609 0.191279
+v -0.93323 0.426233 0.189044
+v -0.937084 0.443651 0.188518
+v -0.93377 0.443651 0.175891
+v -0.986487 0.179346 0.190187
+v -0.984932 0.196918 0.19011
+v -0.983661 0.17923 0.177316
+v -0.205467 -0.184381 -0.282725
+v -0.218312 -0.184523 -0.281235
+v -0.205557 -0.166167 -0.278178
+v -0.218338 -0.202635 -0.284947
+v -0.907167 -0.0664487 0.153077
+v -0.911894 -0.0836614 0.140348
+v -0.894758 0.513067 0.125267
+v -0.885831 0.513195 0.112139
+v -0.507601 0.576613 0.2111
+v -0.518802 0.581404 0.207002
+v -0.513497 0.577011 0.227619
+v -0.250901 0.846723 -0.0680672
+v -0.270824 0.834932 -0.0752734
+v -0.260149 0.840095 -0.0529098
+v 0.0130829 0.220836 0.311691
+v 0.0292937 0.225461 0.317356
+v 0.0479451 0.238088 0.286591
+v 0.122974 0.251858 0.313631
+v 0.109089 0.250239 0.308467
+v 0.114188 0.245474 0.329019
+v 0.124773 0.257998 0.27697
+v 0.117207 0.255133 0.29286
+v 0.131285 0.256007 0.297921
+v -0.842838 -0.453632 0.103546
+v -0.857546 -0.434479 0.10343
+v -0.855927 -0.434556 0.129211
+v -0.858779 -0.4343 0.116391
+v -0.726562 0.733197 -0.259616
+v -0.73933 0.719054 -0.246142
+v -0.722503 0.724937 -0.240027
+v -0.87779 -0.0491718 0.307157
+v -0.883378 -0.0490947 0.294119
+v -0.743197 0.894174 -0.635457
+v -0.752612 0.886762 -0.62071
+v -0.737481 0.891284 -0.614069
+v -0.693087 0.7468 -0.284819
+v -0.704956 0.750461 -0.289135
+v -0.701848 0.741443 -0.269494
+v -0.727526 0.898747 -0.628739
+v -0.60466 0.647326 -0.215159
+v -0.61116 0.646838 -0.199038
+v -0.59712 0.635547 -0.21241
+v -0.624982 0.643562 -0.167079
+v -0.617043 0.631334 -0.16406
+v -0.610492 0.632657 -0.180194
+v -0.96578 0.284562 0.189712
+v -0.954695 0.302301 0.189558
+v -0.962261 0.284793 0.176764
+v -0.743081 0.564744 0.408814
+v -0.757378 0.564923 0.404229
+v -0.753075 0.558616 0.425
+v -0.752625 0.581147 0.123559
+v -0.737879 0.583536 0.128787
+v -0.959062 0.302725 0.253733
+v -0.950995 0.32049 0.253618
+v -0.950918 0.3204 0.240772
+v -0.754475 0.586992 0.179063
+v -0.619728 0.782818 -0.553273
+v -0.625816 0.783422 -0.536728
+v -0.617621 0.772169 -0.533851
+v -0.165659 0.897026 -0.134734
+v -0.154831 0.907276 -0.106462
+v -0.144837 0.915138 -0.121157
+v -0.624789 0.539618 -0.472617
+v -0.630788 0.536933 -0.486349
+v -0.616491 0.553748 -0.482379
+v -0.345866 0.752246 0.0449457
+v -0.360497 0.735535 0.0584846
+v -0.346341 0.735072 0.0626851
+v -0.422501 -0.959261 -0.142364
+v -0.404698 -0.979544 -0.164818
+v -0.427395 -0.981047 -0.144304
+v -0.704738 0.889216 -0.621109
+v -0.694834 0.881855 -0.617461
+v -0.685457 0.888265 -0.632772
+v -0.0233078 0.955973 -0.192101
+v -0.0174375 0.974136 -0.203791
+v -0.0248749 0.975369 -0.193861
+v -0.0791848 -0.91813 -0.132332
+v -0.092621 -0.918696 -0.134503
+v -0.0832568 -0.917886 -0.157304
+v -0.613536 0.59317 -0.106937
+v -0.606998 0.578873 -0.104471
+v -0.600537 0.579272 -0.120784
+v -0.00460504 0.221954 0.0624025
+v 0.00934495 0.22496 0.057046
+v -0.891303 -0.345372 0.115967
+v -0.892331 -0.345038 0.128838
+v -0.900783 -0.327491 0.115813
+v -0.0285358 0.222853 0.0909704
+v -0.0237445 0.220284 0.0741174
+v -0.0356393 0.222082 0.107053
+v -0.624352 0.566195 -0.0362623
+v -0.62967 0.568058 -0.0193836
+v -0.621051 0.557974 -0.0160566
+v 0.0730576 0.254684 0.202378
+v 0.0877655 0.256944 0.207747
+v -0.0324536 0.164908 0.390163
+v -0.0177586 0.167246 0.39552
+v -0.443811 -0.751116 0.29751
+v -0.0489984 -0.428134 0.720775
+v -0.0576561 -0.409136 0.728521
+v -0.0602766 -0.428237 0.713826
+v -0.0409829 0.222712 0.123713
+v -0.947026 0.514506 0.214067
+v -0.93937 0.524037 0.209725
+v -0.94524 0.514249 0.201337
+v 0.143899 0.265589 0.154336
+v 0.137027 0.264446 0.170277
+v 0.152557 0.267234 0.175955
+v 0.00283239 0.212127 0.326669
+v 0.0173219 0.214928 0.332218
+v -0.51238 0.58229 0.190637
+v -0.524493 0.5845 0.18618
+v -0.684365 0.770718 -0.355288
+v -0.673306 0.765567 -0.351203
+v -0.680602 0.762934 -0.335506
+v -0.890969 -0.379733 0.15467
+v -0.892472 -0.379527 0.167554
+v -0.894951 -0.36198 0.154645
+v -0.688617 0.758977 -0.319976
+v -0.299867 0.812311 -0.0305461
+v -0.294215 0.806659 -0.0104047
+v -0.282462 0.818875 -0.0242905
+v -0.926062 -0.221928 0.153938
+v -0.923558 -0.222121 0.141041
+v -0.926641 -0.239424 0.141067
+v -0.562887 0.576291 0.359065
+v -0.574885 0.579785 0.354749
+v -0.569862 0.573928 0.375237
+v -0.861733 -0.41859 0.261004
+v -0.865137 -0.408493 0.274221
+v -0.870815 -0.410767 0.252346
+v -0.740885 0.783024 -0.394659
+v -0.756183 0.779388 -0.400542
+v -0.751906 0.77348 -0.380247
+v -0.474203 0.5436 0.279642
+v -0.467781 0.529406 0.282327
+v -0.1988 0.211845 0.197702
+v -0.187843 0.20609 0.201735
+v -0.182512 0.205191 0.184767
+v -0.634179 0.902665 -0.707082
+v -0.597313 0.579606 -0.129185
+v -0.601089 0.593633 -0.13959
+v -0.607101 0.593543 -0.123186
+v -0.582605 0.57597 0.370677
+v -0.760923 0.817873 -0.494711
+v -0.744892 0.822317 -0.488738
+v -0.18828 0.208556 0.163739
+v -0.193791 0.209944 0.180618
+v -0.177027 0.204035 0.167939
+v -0.0479194 0.221427 0.139872
+v -0.0540594 0.221132 0.15625
+v -0.060238 0.220836 0.172679
+v -0.589323 0.540055 -0.11616
+v -0.593819 0.559682 -0.116353
+v -0.594744 0.549034 -0.0998979
+v -0.0253502 0.182891 0.35516
+v -0.0370009 0.171857 0.369996
+v -0.636696 0.767237 -0.448044
+v -0.64633 0.775034 -0.451641
+v -0.642117 0.76838 -0.431615
+v -0.651931 0.775933 -0.43525
+v 0.10011 0.244767 0.323958
+v 0.104439 0.238845 0.344421
+v 0.0896794 0.236713 0.339077
+v 0.226842 0.264639 0.0560569
+v 0.240766 0.266155 0.0611436
+v 0.244851 0.262147 0.0442521
+v -0.834642 -0.471204 0.129365
+v -0.67608 0.625926 -0.0557357
+v -0.685213 0.6208 -0.0400388
+v -0.666754 0.617319 -0.0522033
+v -0.663325 0.758386 -0.347491
+v -0.656632 0.759787 -0.363406
+v -0.714822 0.74409 -0.273798
+v -0.711482 0.734828 -0.254414
+v 0.249244 0.275493 0.13801
+v 0.263284 0.276071 0.143161
+v 0.268692 0.274915 0.126847
+v -0.631764 0.641995 -0.150984
+v -0.623646 0.63073 -0.147978
+v -0.491211 0.560556 0.310265
+v -0.501346 0.56721 0.306335
+v -0.49667 0.561751 0.326926
+v -0.762953 0.87867 -0.605951
+v -0.749054 0.882035 -0.599965
+v -0.355307 0.707262 0.0818117
+v -0.374845 0.718155 0.0712786
+v -0.367934 0.707082 0.0816062
+v -0.927964 -0.117367 0.204626
+v -0.924149 -0.100078 0.20451
+v -0.926563 -0.117483 0.191767
+v -0.517505 0.587223 0.170097
+v -0.874604 -0.0319591 0.307003
+v -0.879871 -0.0317407 0.293862
+v -0.935041 -0.151716 0.204793
+v -0.932074 -0.134529 0.204741
+v -0.934913 -0.151819 0.192012
+v -0.978664 0.0757487 0.254953
+v -0.985677 0.0933211 0.254864
+v -0.984663 0.0930899 0.242005
+v -0.00838156 0.138254 0.446554
+v 0.00466927 0.155184 0.429906
+v -0.0083944 0.155223 0.420414
+v -0.978561 0.075723 0.242134
+v -0.890006 -0.344755 0.269995
+v -0.686305 0.464936 -0.287259
+v -0.980385 0.092743 0.203482
+v -0.985922 0.110251 0.203457
+v -0.982993 0.110097 0.190611
+v -0.919087 -0.291241 0.205512
+v -0.923339 -0.291036 0.192692
+v -0.912459 -0.30866 0.192718
+v -0.97219 0.267272 0.189751
+v -0.970366 0.267028 0.176957
+v -0.973783 0.249636 0.176944
+v -0.976442 0.249674 0.189841
+v 0.115293 0.255056 0.0882986
+v 0.109859 0.256238 0.104792
+v 0.13072 0.258486 0.0940276
+v -0.896929 -0.344562 0.167361
+v -0.902299 -0.327131 0.167169
+v -0.900513 -0.327208 0.154362
+v -0.876146 -0.0144895 0.306861
+v -0.880641 -0.0143225 0.29399
+v 0.103668 0.25611 0.121028
+v 0.119943 0.26013 0.127027
+v 0.124503 0.258499 0.110225
+v -0.154189 -0.183521 -0.291229
+v -0.16706 -0.183752 -0.288056
+v -0.154137 -0.165499 -0.28609
+v -0.651661 0.623177 -0.0839055
+v -0.643286 0.612849 -0.0808098
+v -0.65572 0.45665 -0.264485
+v -0.672535 0.449329 -0.242339
+v -0.664404 0.456304 -0.274427
+v -0.248974 0.139744 0.390086
+v -0.259032 0.146758 0.385937
+v -0.252506 0.135621 0.395789
+v 0.0654661 0.252076 0.218177
+v 0.0809703 0.255249 0.223752
+v 0.140881 0.255069 0.0607326
+v 0.157104 0.259051 0.0668726
+v 0.161061 0.255724 0.0497755
+v -0.896416 -0.361762 0.167503
+v -0.895696 -0.344806 0.154503
+v 0.161164 0.26907 0.197548
+v 0.154381 0.267375 0.213502
+v 0.168357 0.268428 0.218601
+v 0.171722 0.261556 0.0723062
+v 0.167047 0.263547 0.0890308
+v 0.187175 0.264639 0.0780866
+v -0.41324 0.463869 0.143366
+v -0.408872 0.482855 0.15011
+v -0.420664 0.464255 0.155711
+v -0.0678424 0.21792 0.188762
+v -0.0761277 0.213553 0.204613
+v -0.0851194 0.207875 0.220245
+v -0.148511 0.124497 0.388031
+v -0.161086 0.112409 0.403124
+v -0.541911 0.583922 0.273117
+v -0.529901 0.580633 0.277497
+v -0.524377 0.579631 0.260875
+v -0.687782 0.532283 -0.559259
+v -0.672368 0.539875 -0.580286
+v -0.676555 0.529239 -0.554609
+v -0.0112717 0.197561 0.340914
+v 0.00478487 0.202596 0.346733
+v -0.970456 0.0588315 0.254979
+v -0.704211 0.453362 -0.235814
+v -0.720936 0.475006 -0.248235
+v -0.705547 0.461287 -0.254632
+v -0.603812 0.634108 -0.196315
+v -0.688887 0.912838 -0.671013
+v -0.69766 0.907353 -0.655406
+v -0.686446 0.90147 -0.651578
+v -0.67748 0.907418 -0.666787
+v 0.125466 0.251588 0.0550164
+v 0.145698 0.252256 0.0440465
+v 0.116244 0.261646 0.181119
+v 0.109384 0.260348 0.197085
+v -0.930507 -0.23909 0.153977
+v 0.165916 0.25277 0.0331794
+v -0.433137 -0.878105 -0.118511
+v -0.433137 -0.860185 -0.110508
+v -0.420202 -0.859813 -0.115042
+v -0.937071 0.319385 0.125319
+v 0.120804 0.25372 0.0718566
+v 0.136128 0.257445 0.0775214
+v 0.0503343 0.246167 0.250072
+v 0.0413554 0.240464 0.265577
+v 0.0568469 0.243855 0.2711
+v -0.615797 0.556073 -0.0330124
+v 0.0658 0.249481 0.255609
+v -0.694115 -0.970141 0.00688508
+v -0.691636 -0.948201 0.00484268
+v -0.676979 -0.962511 -0.0340786
+v -0.261408 0.839145 -0.090341
+v -0.290567 0.821714 -0.0701353
+v -0.0940468 0.201979 0.235763
+v -0.10449 0.194298 0.251228
+v -0.113225 0.186861 0.267388
+v -0.125248 0.177137 0.281505
+v 0.260984 -0.175634 0.696549
+v 0.245146 -0.163238 0.686735
+v 0.248088 -0.175595 0.700891
+v -0.458789 0.523099 0.24839
+v -0.0481121 0.161954 0.384909
+v 0.424068 0.2381 0.110482
+v 0.419881 0.241492 0.127297
+v 0.435655 0.233797 0.114953
+v -0.192763 -0.184035 -0.283701
+v -0.192776 -0.166013 -0.27846
+v -0.179931 -0.165871 -0.280079
+v 0.078671 0.226822 0.353849
+v 0.0942652 0.230008 0.359283
+v 0.432045 0.230188 0.0769819
+v 0.428102 0.234234 0.0937193
+v 0.443362 0.225538 0.0811309
+v -0.966718 0.0937578 0.421981
+v -0.970263 0.110971 0.421724
+v -0.966936 0.110958 0.409046
+v 0.415655 0.244973 0.144124
+v 0.426907 0.240079 0.14826
+v 0.431069 0.23661 0.131459
+v 0.243874 0.276315 0.154362
+v -0.874065 -0.397562 0.270162
+v 0.254677 0.274337 0.121619
+v 0.257889 0.277137 0.159526
+v 0.237054 0.275352 0.170175
+v 0.251787 0.276983 0.175659
+v 0.0430767 0.173861 0.429996
+v 0.0448365 0.182429 0.417703
+v 0.0303213 0.173463 0.423407
+v -0.507306 0.567981 0.323008
+v -0.504107 0.584705 0.174079
+v 0.0840275 0.207503 0.39349
+v 0.0698977 0.206848 0.388467
+v 0.0714777 0.195428 0.408146
+v -0.767282 0.558013 0.420144
+v -0.777892 0.549779 0.435892
+v -0.765342 0.550305 0.440144
+v -0.683762 0.584307 0.110598
+v -0.689298 0.585579 0.127335
+v -0.67039 0.58378 0.115441
+v -0.609773 0.760583 -0.531089
+v -0.692496 0.593594 0.275583
+v -0.70592 0.593992 0.270856
+v -0.698739 0.593607 0.292076
+v -0.60466 0.759208 -0.547942
+v -0.850905 0.547325 0.373374
+v -0.868824 0.541172 0.366361
+v -0.863069 0.536343 0.38893
+v -0.0421133 0.688906 -0.192859
+v -0.0414197 0.69678 -0.199141
+v -0.0373092 0.679144 -0.185486
+v -0.567486 0.546118 0.45209
+v -0.578096 0.537756 0.467684
+v -0.55694 0.539772 0.455777
+v 0.0663524 0.693196 -0.206334
+v 0.0777076 0.70495 -0.227477
+v 0.0785811 0.705862 -0.22189
+v -0.127111 0.200399 0.110983
+v -0.132531 0.201222 0.127734
+v -0.112454 0.202686 0.11634
+v -0.573883 0.526477 0.476406
+v -0.586792 0.526336 0.480979
+v 0.134625 0.262545 0.132448
+v 0.140778 0.26234 0.116263
+v 0.409527 0.133771 0.459541
+v 0.415462 0.120887 0.467749
+v 0.421294 0.134349 0.454017
+v 0.0983372 0.256778 0.137599
+v 0.091375 0.255853 0.15354
+v 0.106828 0.259115 0.159205
+v 0.151632 0.260451 0.0832761
+v 0.112904 0.259501 0.142968
+v 0.0586195 0.250342 0.234337
+v 0.0733531 0.252474 0.23968
+v -0.973025 0.180566 0.459939
+v -0.969171 0.198177 0.459797
+v -0.971779 0.180515 0.447093
+v -0.970751 0.0585232 0.242198
+v 0.222102 0.267105 0.0727172
+v 0.236784 0.269289 0.0781893
+v 0.182024 0.271293 0.186758
+v 0.167291 0.269507 0.181363
+v 0.175203 0.26988 0.202673
+v -0.388859 0.306823 0.15336
+v -0.397928 0.326399 0.153347
+v -0.391403 0.314491 0.164112
+v -0.575835 0.740634 -0.681482
+v -0.576079 0.76084 -0.68152
+v -0.578186 0.760814 -0.668713
+v -0.135691 0.168672 0.296675
+v -0.112955 0.157214 0.342944
+v -0.125531 0.144946 0.357652
+v -0.146725 0.158896 0.311768
+v -0.29076 0.782998 0.0274632
+v -0.30426 0.76576 0.0424794
+v -0.291081 0.765015 0.0441236
+v -0.810391 0.575893 0.310163
+v -0.884045 0.00315994 0.306848
+v -0.887732 0.00287735 0.294183
+v -0.927398 -0.135055 0.153514
+v -0.925009 -0.135171 0.140617
+v -0.927886 -0.152384 0.140707
+v -0.154304 -0.128928 -0.279848
+v -0.167137 -0.129198 -0.276508
+v -0.154368 -0.110585 -0.278165
+v -0.929492 -0.15223 0.153514
+v -0.283926 -0.801675 -0.168389
+v -0.28778 -0.796306 -0.147169
+v -0.272841 -0.794276 -0.149519
+v 0.102525 0.25891 0.213091
+v 0.122345 0.262121 0.164869
+v -0.706421 0.901868 -0.63994
+v -0.6959 0.894791 -0.63642
+v 0.128421 0.262622 0.148633
+v -0.976789 0.0755817 0.203649
+v -0.978651 0.0927045 0.190688
+v -0.506753 0.575264 0.248621
+v -0.741527 0.588019 0.314658
+v -0.749889 0.583755 0.330625
+v -0.735079 0.585784 0.33575
+v -0.101767 0.166655 0.327761
+v -0.157181 0.150765 0.327144
+v -0.165518 0.146526 0.343136
+v -0.0913493 0.17494 0.312488
+v -0.776338 0.583947 0.190162
+v -0.760743 0.587133 0.195583
+v -0.409656 0.292295 0.346951
+v -0.403413 0.277959 0.349572
+v -0.396399 0.278525 0.333168
+v -0.598584 0.647506 -0.231472
+v -0.594179 0.640826 -0.231511
+v -0.592521 0.64766 -0.247747
+v -0.602078 0.730615 -0.472514
+v -0.609593 0.742445 -0.475237
+v -0.606317 0.73434 -0.45552
+v -0.509168 0.525398 0.414171
+v -0.509348 0.506953 0.41331
+v -0.502412 0.52518 0.401454
+v 0.388911 0.244176 0.299141
+v 0.377209 0.248287 0.294877
+v 0.381615 0.241646 0.314838
+v 0.438815 0.219834 0.0430831
+v 0.435552 0.225332 0.059949
+v 0.450568 0.216148 0.0475276
+v -0.61414 0.745901 -0.458307
+v -0.610993 0.736883 -0.43877
+v -0.160123 0.191665 0.0612849
+v -0.146109 0.192191 0.0665001
+v -0.932485 -0.186578 0.204998
+v -0.93508 -0.169057 0.204908
+v -0.935118 -0.169121 0.192101
+v -0.619227 0.747327 -0.441814
+v -0.624159 0.749639 -0.425102
+v -0.615887 0.738476 -0.422238
+v -0.933461 -0.203868 0.205139
+v -0.93237 -0.186642 0.192166
+v 0.230952 0.275108 0.186321
+v 0.245698 0.27679 0.191742
+v 0.239584 0.276662 0.20785
+v 0.224851 0.274722 0.202468
+v 0.0574249 0.194516 0.402983
+v 0.0590177 0.182968 0.422649
+v 0.218762 0.274543 0.218576
+v 0.232815 0.275275 0.223739
+v -0.99255 0.21503 0.254208
+v -0.990944 0.214928 0.241376
+v -0.993937 0.197355 0.241427
+v 0.108164 0.231254 0.364562
+v 0.0964489 0.219976 0.379078
+v -0.245968 -0.972453 0.463818
+v -0.236116 -0.969704 0.440889
+v -0.934617 0.0224664 0.191087
+v -0.935953 0.022749 0.203932
+v -0.954656 0.0406168 0.191087
+v -0.642965 0.0822099 -0.098729
+v -0.655669 0.0818245 -0.0933853
+v -0.642836 0.100592 -0.0944772
+v -0.99833 0.179886 0.254363
+v -0.99571 0.197509 0.254273
+v -0.995517 0.179783 0.241492
+v -0.919216 -0.0830834 0.204407
+v -0.919177 -0.0831091 0.191613
+v -0.934695 0.355275 0.189263
+v -0.933975 0.372848 0.189468
+v -0.929595 0.35507 0.176661
+v -0.93052 0.390677 0.189828
+v -0.925407 0.390202 0.176469
+v -0.928696 0.372873 0.176456
+v -0.838034 -0.453478 0.167837
+v -0.838213 -0.453632 0.155017
+v 0.191055 0.268903 0.116417
+v 0.205801 0.270779 0.121889
+v 0.211209 0.26979 0.105447
+v -0.832973 -0.471024 0.167939
+v 0.146186 0.261582 0.0997566
+v 0.197259 0.268582 0.100296
+v -0.931702 -0.256341 0.154105
+v -0.929004 -0.256585 0.141221
+v -0.979293 0.232102 0.189931
+v -0.977649 0.231999 0.177124
+v 0.181305 0.256097 0.0389855
+v -0.975298 0.0754918 0.190855
+v -0.890353 0.510947 0.405321
+v -0.870083 0.52667 0.402662
+v -0.876544 0.528378 0.391011
+v 0.161562 0.266797 0.234581
+v 0.753563 -0.0941047 0.0605913
+v 0.744777 -0.0760827 0.0604628
+v 0.746768 -0.0757487 0.073231
+v -0.113636 -0.92594 0.335853
+v -0.12169 -0.924951 0.356406
+v -0.126982 -0.926531 0.333644
+v -0.175242 0.139834 0.358846
+v -0.185698 0.131626 0.374363
+v -0.136629 0.135158 0.372822
+v 0.222603 -0.174863 0.707352
+v 0.235563 -0.174747 0.7031
+v 0.22241 -0.158704 0.691424
+v -0.883686 0.528507 0.379951
+v -0.885047 0.534865 0.362045
+v -0.892138 0.527377 0.370471
+v -0.353329 0.470151 0.0226463
+v -0.361011 0.468648 0.0114323
+v -0.338878 0.479541 0.00423895
+v -0.934784 0.374479 0.45886
+v -0.931663 0.392051 0.458718
+v -0.9321 0.39209 0.445925
+v 0.137888 0.253168 0.318872
+v 0.259571 0.263765 0.0498654
+v 0.145351 0.256649 0.303085
+v 0.153649 0.260605 0.287414
+v 0.175602 0.267927 0.239706
+v 0.168074 0.265076 0.255442
+v 0.160508 0.262185 0.271267
+v -0.870969 -0.415854 0.129147
+v -0.871136 -0.416034 0.116301
+v 0.211389 0.261633 0.0502251
+v 0.230901 0.260849 0.0391396
+v 0.0975921 0.757706 -0.293965
+v 0.103051 0.764077 -0.272474
+v 0.099095 0.744693 -0.272654
+v 0.206623 0.26451 0.0668341
+v 0.202667 0.267452 0.0838926
+v 0.217336 0.269815 0.0893262
+v -0.626292 0.763961 -0.481133
+v -0.634962 0.774045 -0.484242
+v -0.631224 0.766209 -0.464473
+v -0.640524 0.774944 -0.467864
+v -0.650107 0.578411 0.0104818
+v -0.655656 0.579297 0.0272192
+v -0.645136 0.573003 0.0311627
+v -0.0810988 0.183662 0.297433
+v -0.610852 0.602265 -0.572489
+v -0.603453 0.618527 -0.578822
+v -0.601475 0.618578 -0.566041
+v -0.444145 -0.609021 0.44017
+v -0.435937 -0.627069 0.440684
+v -0.431891 -0.608546 0.454813
+v -0.263695 0.81217 0.00043674
+v -0.265249 0.802818 0.0123315
+v -0.249745 0.812671 0.00575469
+v 0.537274 0.101259 0.41814
+v 0.536567 0.112833 0.408994
+v 0.522219 0.118408 0.418898
+v -0.0679709 0.197458 0.283149
+v -0.996506 0.145229 0.241749
+v -0.99693 0.162544 0.241569
+v -0.994823 0.16239 0.228852
+v -0.6968 0.754648 -0.304588
+v -0.402732 0.29381 0.33051
+v -0.389823 0.279886 0.316598
+v -0.816531 0.576882 0.288942
+v 0.374293 0.239102 0.330587
+v 0.363092 0.244176 0.32654
+v 0.366444 0.236662 0.346656
+v 0.446881 0.220721 0.0640723
+v 0.370966 0.247567 0.310856
+v 0.401705 0.24591 0.267182
+v 0.390465 0.250715 0.263033
+v 0.395102 0.244754 0.283123
+v 0.355744 0.241504 0.342366
+v -0.304787 0.782202 0.0226591
+v -0.277735 0.797205 0.0143354
+v -0.67125 0.498192 0.531988
+v -0.663697 0.491166 0.536869
+v -0.650929 0.491101 0.531962
+v -0.956377 0.058703 0.300452
+v -0.96298 0.0572386 0.279295
+v -0.952447 0.0492489 0.285795
+v 0.152429 0.206809 0.417896
+v 0.139005 0.20758 0.413169
+v 0.138492 0.19223 0.432283
+v -0.988388 0.232628 0.254093
+v -0.984033 0.250201 0.254003
+v -0.986769 0.232513 0.24126
+v -0.993898 0.127836 0.241787
+v -0.994245 0.127824 0.254619
+v -0.326071 0.489945 -0.0118562
+v -0.317324 0.490331 -0.0019011
+v -0.141446 -0.128684 -0.283098
+v -0.456503 0.360465 0.0186514
+v -0.442463 0.344601 0.0253823
+v -0.453767 0.343599 0.0116892
+v -0.154214 -0.147271 -0.282815
+v -0.167175 -0.147451 -0.27855
+v 0.225994 0.273913 0.239655
+v -0.620884 0.762831 -0.497601
+v -0.61775 0.753736 -0.478102
+v 0.211222 0.272051 0.234285
+v 0.204439 0.270188 0.250188
+v 0.218505 0.271087 0.255313
+v 0.0810217 0.216559 0.373605
+v 0.118491 0.239655 0.349521
+v 0.128973 0.247529 0.334299
+v 0.196026 0.272359 0.191896
+v 0.189218 0.270946 0.207824
+v 0.184889 0.269237 0.132551
+v 0.1802 0.270689 0.149224
+v 0.200406 0.271819 0.138292
+v 0.188139 0.271562 0.170573
+v 0.173392 0.2697 0.165165
+v 0.194279 0.271832 0.154413
+v 0.14679 0.264998 0.229199
+v 0.154754 0.265281 0.250522
+v 0.139969 0.263406 0.245191
+v 0.231337 0.270702 0.0945157
+v 0.800924 -0.415905 0.04799
+v 0.803711 -0.415622 0.0609124
+v 0.802799 -0.433709 0.0608225
+v -0.451198 0.364383 0.0250869
+v -0.440009 0.364742 0.0377652
+v -0.73337 0.867764 -0.576356
+v -0.742953 0.861264 -0.561018
+v -0.73021 0.857295 -0.557229
+v -0.596414 0.621301 -0.193347
+v -0.554923 0.582791 0.305834
+v -0.561115 0.582419 0.322237
+v -0.549117 0.579027 0.326553
+v -0.0865195 0.953751 -0.13905
+v -0.0721842 0.938632 -0.128132
+v -0.0735329 0.957925 -0.138254
+v -0.164285 0.195287 0.0786004
+v -0.169076 0.19792 0.0956076
+v -0.150926 0.194902 0.0834687
+v -0.929531 -0.169648 0.140733
+v 0.0669047 0.215827 0.368532
+v 0.146751 0.240528 0.359437
+v 0.13573 0.230984 0.374312
+v 0.149089 0.230342 0.379155
+v -0.931149 -0.169532 0.153553
+v 0.178697 0.252551 0.333682
+v 0.164657 0.251871 0.32857
+v 0.169089 0.245756 0.348878
+v 0.156411 0.247593 0.344228
+v 0.159468 0.238717 0.364113
+v 0.18241 0.269404 0.223752
+v 0.0423445 0.192859 0.397896
+v 0.103578 0.764205 -0.285307
+v 0.0996089 0.764372 -0.298191
+v -0.460536 0.534737 0.228878
+v -0.0566927 0.206681 0.268056
+v -0.0470202 0.213669 0.25268
+v -0.740615 0.850898 -0.541532
+v -0.600999 0.860095 -0.695033
+v -0.608385 0.857424 -0.67908
+v -0.594474 0.846223 -0.692683
+v -0.421974 0.676947 0.0922035
+v -0.424531 0.656318 0.10984
+v -0.601487 0.84463 -0.676613
+v -0.036577 0.22189 0.237535
+v 0.308486 0.192487 0.436522
+v 0.297247 0.19724 0.432347
+v 0.296206 0.180297 0.450896
+v -0.757545 0.580852 0.346785
+v -0.743428 0.581532 0.351666
+v 0.348178 0.238306 0.357973
+v 0.359495 0.233502 0.362147
+v -0.158556 0.195428 0.231498
+v -0.171157 0.197895 0.226938
+v -0.166199 0.192397 0.247632
+v 0.33884 0.231626 0.373092
+v 0.350195 0.227285 0.377446
+v 0.33049 0.211626 0.406939
+v 0.318557 0.215261 0.402816
+v 0.319559 0.202121 0.421801
+v 0.307561 0.205717 0.417601
+v 0.284877 0.184703 0.446464
+v -0.933872 -0.256148 0.17968
+v -0.872819 0.545874 0.346618
+v -0.456002 0.483458 0.268878
+v -0.454409 0.50324 0.255994
+v -0.45735 0.503292 0.268993
+v -0.867411 -0.0549393 0.345179
+v -0.872549 -0.0721135 0.350844
+v -0.865664 -0.0716639 0.362096
+v -0.705663 -0.972338 0.0254465
+v -0.702631 -0.949717 0.0179577
+v -0.0517087 0.683717 -0.18713
+v -0.0549201 0.689099 -0.190868
+v 0.597043 0.0588572 0.412989
+v 0.604943 0.0475533 0.416034
+v 0.608604 0.0500067 0.40848
+v -0.471133 0.555508 0.206064
+v -0.476503 0.556728 0.22266
+v -0.46814 0.546413 0.225859
+v 0.965022 -0.503664 0.232449
+v 0.972074 -0.50938 0.22731
+v 0.970854 -0.503921 0.215711
+v -0.736286 0.582971 0.0360182
+v -0.743852 0.577101 0.0516895