lltcggie 485213433b Merge branch 'upconv' ...

# Conflicts:
#	bin/lang/english.json
#	bin/lang/japanese.json
#	common/waifu2x.cpp
#	common/waifu2x.h
#	waifu2x-caffe-gui/MainDialog.cpp
#	waifu2x-caffe-gui/Resource.rc
#	waifu2x-caffe-gui/resource.h

2016-07-03 22:23:54 +09:00

..

lang

Merge branch 'upconv'

2016-07-03 22:23:54 +09:00

models

noise_scaleに対応

2016-07-03 17:41:27 +09:00

crop_size_list.txt

プロジェクト設定でバイナリの出力先を変更

2015-12-06 04:45:26 +09:00