| commit | 119f95d22f82c26c7cc68d33df6369c9bf766172 | |
| author | elliottcable <git@elliottcable.name> | |
| Tue, 17 Mar 2009 01:51:14 +0000 (16 17:51 -0800) | ||
| committer | elliottcable <git@elliottcable.name> | |
| Tue, 17 Mar 2009 01:51:14 +0000 (16 17:51 -0800) | ||
| tree | a94735e6c21f9c06d6b9291d97d18e99e322b5ab | treesnapshot (tar.gz zip) |
| parent | b52ab6dd8613343b2ca56643c13f667336ef3e49 | commitdiff |
| parent | 7c3527d58b8849d9681415279f4f3c361d762389 | commitdiff |
Merge branch 'master' of git@github.com:elliottcable/nfoiled
Conflicts:
examples/initialization.rb
lib/nfoiled.rb
lib/nfoiled/window.rb
Conflicts:
examples/initialization.rb
lib/nfoiled.rb
lib/nfoiled/window.rb