2 commits

Author	SHA1	Message	Date
Thomas Goyne	dd38e1f07f	Don't swallow errors when parsing json and make agi::json_util::file actually work ... Originally committed to SVN as r5507.	2011-07-26 19:52:47 +00:00
Amar Takhar	167f09a610	Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258. ... Originally committed to SVN as r5126.	2011-01-05 13:00:46 +00:00