diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-06-13 13:16:16 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-06-13 13:16:16 -0600 |
| commit | e8bea8a6edf69e824a922adeb5e697111ceabe90 (patch) | |
| tree | db1937956bc585b300f2a2c8312af4ad5bf924de /data/graphics/CMakeLists.txt | |
| parent | 593fd2b831304c8e421589aab0fb158e4b7e9c35 (diff) | |
| parent | 0b15a3ad32838134384524ce4af95d65b0b4e5da (diff) | |
| download | mana-e8bea8a6edf69e824a922adeb5e697111ceabe90.tar.gz mana-e8bea8a6edf69e824a922adeb5e697111ceabe90.tar.bz2 mana-e8bea8a6edf69e824a922adeb5e697111ceabe90.tar.xz mana-e8bea8a6edf69e824a922adeb5e697111ceabe90.zip | |
Merge remote branch '1.0/1.0'
Conflicts:
data/graphics/CMakeLists.txt
data/graphics/Makefile.am
src/client.cpp
Diffstat (limited to 'data/graphics/CMakeLists.txt')
| -rw-r--r-- | data/graphics/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/data/graphics/CMakeLists.txt b/data/graphics/CMakeLists.txt index d7e78c30..a46ccfd0 100644 --- a/data/graphics/CMakeLists.txt +++ b/data/graphics/CMakeLists.txt @@ -1,5 +1,6 @@ ADD_SUBDIRECTORY(gui) ADD_SUBDIRECTORY(images) +ADD_SUBDIRECTORY(sprites) SET (FILES target-cursor-in-range-l.png @@ -8,4 +9,4 @@ SET (FILES target-cursor-normal-l.png target-cursor-normal-m.png target-cursor-normal-s.png - )
\ No newline at end of file + ) |