anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
A GTK+ / GStreamer based music player
2,366 Commits 9 Branches 131 Tags 139 MiB
C 97.5%
C++ 2.1%
CMake 0.2%
Shell 0.2%
Go to file
Anna Schumaker 40a99f7eda Merge branch 'Ocarina-next' 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>

Conflicts:
	.gitignore
	Sconstruct
	gui/main.cpp
	include/deck.h
	include/playqueue.h
	lib/deck.cpp
	lib/playqueue.cpp
 		2014-06-11 12:12:43 -04:00
core callbacks: Remove unused queue callback 2014-06-06 14:46:54 -04:00
gui gui: collection manager fixes 2014-06-06 09:20:50 -04:00
include callbacks: Remove unused queue callback 2014-06-06 14:46:54 -04:00
share Rip out import stuff 2014-04-10 08:42:53 -04:00
tests playlist: Fix a null pointer dereference in init() 2014-06-06 08:21:56 -04:00
.gitattributes Created a PKGBUILD 2011-11-11 08:12:40 -05:00
.gitignore Merge branch 'Ocarina-next' 2014-06-11 12:12:43 -04:00
DESIGN Remove error.h 2014-06-06 09:40:14 -04:00
LICENSE Update the license 2014-04-06 19:57:06 -04:00
PKGBUILD Update PKGBUILD and .gitignore 2014-04-20 11:38:46 -04:00
README Add a `scons install` option 2014-04-09 20:37:46 -04:00
Sconstruct Rename lib/ -> core/ 2014-06-05 10:21:32 -04:00
TODO TODO: Remove completed items 2014-06-06 09:57:31 -04:00

README 

Build:
	$ scons

Clean:
	$ scons -c

Install:
	$ sudo scons install

Uninstall:
	$ sudo scons -c install

Build tests:
	$ scons tests

Clean tests:
	$ scons -c tests