comparison make/hotspot_version @ 16914:826c172a048f

SL: fixed merge problem.
author Christian Humer <christian.humer@gmail.com>
date Sat, 23 Aug 2014 19:31:36 +0200
parents 02f27ecb4f3a
children 89152779163c
comparison
equal deleted inserted replaced
16913:b879421229db 16914:826c172a048f