diff options
| author | Andrew Haines <andrewd207@aol.com> | 2015-02-01 23:17:27 -0500 |
|---|---|---|
| committer | Andrew Haines <andrewd207@aol.com> | 2015-02-01 23:17:27 -0500 |
| commit | d351655a167dc6afe70ed659561ef8b3a4019305 (patch) | |
| tree | 3843e8f137929b13a74ba787ec6f9f5541fc2427 /examples/gui/sprites/readme.txt | |
| parent | c7fc66e330b4665843e195436e7e5095de5dbdfc (diff) | |
| parent | 0955cc8f881782e1565447f04a0afb774e1237aa (diff) | |
| download | fpGUI-d351655a167dc6afe70ed659561ef8b3a4019305.tar.xz | |
Merge branch 'develop' of https://github.com/graemeg/fpGUI into develop
Fixed xml conflicts of lpi's manually
Conflicts:
examples/gui/filedialog/filedialog.lpi
examples/gui/modalforms/modalforms.lpi
Diffstat (limited to 'examples/gui/sprites/readme.txt')
0 files changed, 0 insertions, 0 deletions