Merge branch 'experimental'
authorozzloy <ozzloy@gmail.com>
Sun, 8 Feb 2009 06:08:17 +0000 (22:08 -0800)
committerozzloy <ozzloy@gmail.com>
Sun, 8 Feb 2009 06:08:17 +0000 (22:08 -0800)
commit9697235736e8a25c48d50d564f66ca1ba03a7449
treef367c3998267c0e4da17f7ebee26170e7e91e129
parent7ddd74477f2788d32a220bd4eb30d7c1fefdc938
parent64bf40b9ce50c0b8bdb4a33111aef9fb77c08ea9
Merge branch 'experimental'

Conflicts:

hello-world.cpp

dude, git is neat!  decided to not use either comment change
hello-world.cpp