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
..
Makefile	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.	2011-01-05 13:00:46 +00:00
OLD_METHOD_TO_NEW_COMMAND_MAP.txt	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.	2011-01-05 13:00:46 +00:00
OLD_TO_NEW_OPTION_MAP.txt	Merge all changes from the libaegisub branch into trunk, the effective range is r4175:4330. All options have been re-done and now use Cajun to support a json-backed format.	2010-05-21 01:13:36 +00:00
default_config.json	Change default path to dictionaries to ?user/dictionaries (from ?user/dictionary) to match 2.1.x	2010-11-17 05:43:48 +00:00
default_hotkey.json	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.	2011-01-05 13:00:46 +00:00
default_menu.json	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.	2011-01-05 13:00:46 +00:00
default_mru.json	Merge all changes from the libaegisub branch into trunk, the effective range is r4175:4330. All options have been re-done and now use Cajun to support a json-backed format.	2010-05-21 01:13:36 +00:00
default_path.json	Fix syntax errors	2010-06-13 01:42:50 +00:00
default_toolbar.json	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.	2011-01-05 13:00:46 +00:00
libresrc.cpp	* Return an std::string	2010-03-06 03:55:27 +00:00
libresrc.h	* Return an std::string	2010-03-06 03:55:27 +00:00
wscript	Fix the waf build after the libresrc changes, and also tweak the script to properly handle dependency tracking with the generated files.	2010-03-13 17:50:51 +00:00