Merge remote-tracking branch 'schriftgestalt/master'

* schriftgestalt/master:
  add option to insert NSLocalizedStringFromTableInBundle

Conflicts:
	QuickLocalization/QuickLocalization.m
This commit is contained in:
Zitao Xiong
2015-11-19 02:26:20 -05:00
12 changed files with 686 additions and 58 deletions

View File

@@ -4,4 +4,5 @@
#ifdef __OBJC__
#import <Foundation/Foundation.h>
#import "AMConstString.h"
#endif