OSDN Git Service

Merge branch 'master' of git.sourceforge.jp:/gitroot/karinto/karinto
authorkimikage <kimikage_ceo@hotmail.com>
Wed, 24 Nov 2010 01:45:53 +0000 (10:45 +0900)
committerkimikage <kimikage_ceo@hotmail.com>
Wed, 24 Nov 2010 02:05:50 +0000 (11:05 +0900)
commite7971124d6140dc84eab92720ee2c7fdbde1e7e0
tree17089329cceccb5298453e93f412234766ab9fdb
parentddbee3cf44286b79fc8f58506073349446ecb666
parent56b4f6012ca1554e653c222f6011e766f0643106
Merge branch 'master' of git.sourceforge.jp:/gitroot/karinto/karinto

Conflicts:
Karinto/WindowFunction.cs
Karinto/WindowFunction.cs