Merge pull request #5 from Bediko/master

moar for everyone!
This commit is contained in:
Maximilian Gass 2011-05-30 04:31:50 -07:00
commit 73828d1540
1 changed files with 9 additions and 0 deletions

View File

@ -1,8 +1,10 @@
cities: cities:
- Berlin - Berlin
- Bakersfield
- Detroit - Detroit
- Gothenburg - Gothenburg
- London - London
- New Orleans
- Rio - Rio
- Rotterdam - Rotterdam
- San Francisco - San Francisco
@ -15,12 +17,15 @@ group:
- chiptune - chiptune
- core - core
- country - country
- cumbia
- dance - dance
- dancehall - dancehall
- drum and bass - drum and bass
- dub - dub
- dubstep - dubstep
- flamenco
- grunge - grunge
- gospel
- hip-hop - hip-hop
- house - house
- humppa - humppa
@ -28,6 +33,7 @@ group:
- jazz - jazz
- metal - metal
- oi! - oi!
- polka
- pop - pop
- punk - punk
- rap - rap
@ -60,6 +66,7 @@ subgroup:
- christian - christian
- comedy - comedy
- conscious - conscious
- cow
- crust - crust
- dark - dark
- death - death
@ -67,6 +74,7 @@ subgroup:
- doom - doom
- drone - drone
- east coast - east coast
- electroclash
- electronic - electronic
- emo - emo
- euro - euro
@ -132,3 +140,4 @@ subgroup:
- viking - viking
- vocal - vocal
- west coast - west coast
- world