2 Commits

Author SHA1 Message Date
Marvin Smith
9a0e038a48 Fixed compile warning from redefined macro. 2015-01-17 20:37:51 -08:00
mshabunin
3ed89a8879 Merge with master and fix conflicts 2014-08-13 18:24:11 +04:00