]> mj.ucw.cz Git - libucw.git/commit
Merge branch 'master' into dev-table
authorRobert Kessl <kesslr@centrum.cz>
Mon, 21 Jul 2014 10:40:57 +0000 (12:40 +0200)
committerRobert Kessl <kesslr@centrum.cz>
Mon, 21 Jul 2014 10:40:57 +0000 (12:40 +0200)
commit9160b9f6e7a235113bbe95364d0fc1a4ad247186
tree1f7bdf6e82d0434d022046e1272dde97099fe6b0
parentb9f18336270ad857eeed9e114fb059fddda7765b
parentec6703bb4d58e504fde8ea8429f9b26ab6632696
Merge branch 'master' into dev-table

Conflicts:
ucw/table.h
ucw/table.h