summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-12 17:29:16 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-12 17:29:16 -0300
commit0bc57968a5b0f9f92aace387e1ebcd8e6e4362cc (patch)
tree605eb2e679dfa6e94f91944d71a81563647b8ac7 /Makefile
parent39334868d40f56cac70ebd183e25a79504163fd1 (diff)
parent6c1c38598677b01a9f30c201aeb72fbbfcc5e117 (diff)
Merge remote-tracking branch 'ivan/bug/update-ui-resources-path' into develop
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions