OSDN Git Service

Merge branch 'frame' of cake_67@git.sourceforge.jp:/gitroot/trpgtools-onweb/cake...
authorCake <cake_67@users.sourceforge.jp>
Fri, 23 Jul 2010 02:22:15 +0000 (11:22 +0900)
committerCake <cake_67@users.sourceforge.jp>
Fri, 23 Jul 2010 02:22:15 +0000 (11:22 +0900)
commite485b91c72751dc035cbf7c651407f43fdf3c4d2
tree608fbb3ab9d275d431fe480ba842b69eaf285d21
parent8830c88db795f7c48e3799c4d2d65db7e1a6310c
parentfc0a92582795a19182fbbd5bb6c85e1612deb272
Merge branch 'frame' of cake_67@git.sourceforge.jp:/gitroot/trpgtools-onweb/cake-frame into frame

Conflicts:

app/views/characters/index.ctp

no changes added to commit (use "git add" and/or "git commit -a")