Merge changes I29db4164,I90632cf4
[gigi.git] / Gigi.MF
2015-03-01 Felix DörreMerge remote-tracking branch 'origin/libs/scrypt/local'
2014-06-23 Janis StreibMerge branch 'ant_build'
2014-06-23 Janis StreibAdded manifest