Stephen Birarda
|
d257b70103
|
fixes for new Menu class after merge with upstream/master
|
2013-08-15 12:29:04 -07:00 |
|
ZappoMan
|
4305ad552d
|
fix issue with JurisdictionMap being passed across wire
|
2013-08-14 14:19:06 -07:00 |
|
ZappoMan
|
f09dcfa4b7
|
Merge branch 'master' of https://github.com/worklist/hifi into voxel_sending_helper
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
|
2013-08-14 13:12:23 -07:00 |
|
ZappoMan
|
60dedee739
|
make JurisdictionMap handle copy/move/assigment so that it will work in std::vector<> and std::map<>, switch application to have map of JurisdictionMap objects instead of just root codes
|
2013-08-13 11:08:43 -07:00 |
|
ZappoMan
|
7d2c69f530
|
latest work on threaded sending
|
2013-08-12 16:55:58 -07:00 |
|