aboutsummaryrefslogtreecommitdiff
path: root/lumina-desktop/main.cpp
diff options
context:
space:
mode:
authorChristopher Roy Bratusek <nano@jpberlin.de>2014-11-04 18:10:54 +0100
committerChristopher Roy Bratusek <nano@jpberlin.de>2014-11-04 18:10:54 +0100
commit3176806823acfabb3b3a7f7c43ed8cfffa499dc4 (patch)
treee24e18020dfdd2db6da5cd21320a2ddfc45196d9 /lumina-desktop/main.cpp
parentMerge remote-tracking branch 'upstream/master' (diff)
parentMerge pull request #21 from rezso/master (diff)
downloadlumina-3176806823acfabb3b3a7f7c43ed8cfffa499dc4.tar.gz
lumina-3176806823acfabb3b3a7f7c43ed8cfffa499dc4.tar.bz2
lumina-3176806823acfabb3b3a7f7c43ed8cfffa499dc4.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'lumina-desktop/main.cpp')
0 files changed, 0 insertions, 0 deletions
bgstack15