]> Devoid-pointer.net GitWeb - libHPCS.git/commitdiff
git://gitweb.devoid-pointer.net / libHPCS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0776da2 77beeaa)
Merge branch 'master' of devoid-pointer.net:libHPCS
authorMichal Malý <madcatxster@devoid-pointer.net>
Fri, 1 Aug 2014 15:40:48 +0000 (17:40 +0200)
committerMichal Malý <madcatxster@devoid-pointer.net>
Fri, 1 Aug 2014 15:40:48 +0000 (17:40 +0200)
Conflicts:
libhpcs_p.h


Trivial merge
Library for parsing Agilent ChemStation datafiles