diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-26 15:20:04 -0600 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-26 15:20:04 -0600 |
| commit | 1a83da7298c17e2bcafa8166c347cbdf714315a4 (patch) | |
| tree | b446cd40ac80dc9811a3de36eafeaa4dfcebde50 /res/layout/log_in_dialog.xml | |
| parent | 1fb7b037923b8fc78aef743bfe8ee08caf2c6d1a (diff) | |
| parent | 22e90c26036291de66f26ee148bb4c75b68c7764 (diff) | |
Merge branch 'feature/licensing' into develop
Diffstat (limited to 'res/layout/log_in_dialog.xml')
0 files changed, 0 insertions, 0 deletions