| *** JED3 has quit IRC | 00:09 | |
| *** kreynen has quit IRC | 00:20 | |
| *** Bovinity has quit IRC | 00:34 | |
| *** pyrak has quit IRC | 00:43 | |
| *** nkinkade has joined #cc | 00:49 | |
| *** everton137 has quit IRC | 00:50 | |
| stew | trinity_4: do you have any questions or discussion related to the creative commons licenses? | 00:53 |
|---|---|---|
| *** ^Einstein has quit IRC | 00:58 | |
| trinity_4 | does creative commons have their financials audited by a third party? | 01:03 |
| *** njan has left #CC | 01:08 | |
| *** njan has joined #cc | 01:10 | |
| *** stevel has quit IRC | 01:13 | |
| *** nkinkade has left #cc | 02:03 | |
| *** K`Tetch_ has joined #cc | 02:27 | |
| *** gimmulf has joined #cc | 02:36 | |
| *** Fi has joined #cc | 02:36 | |
| *** K`Tetch has quit IRC | 02:38 | |
| *** K`Tetch_ has quit IRC | 02:39 | |
| *** K`Tetch has joined #cc | 02:43 | |
| *** K`Tetch_ has joined #cc | 02:57 | |
| *** K`Tetch has quit IRC | 03:06 | |
| *** pyrak has joined #cc | 03:35 | |
| *** K`Tetch has joined #cc | 03:35 | |
| *** K`Tetch_ has quit IRC | 03:48 | |
| *** K`Tetch_ has joined #cc | 03:48 | |
| *** Fur has joined #cc | 03:55 | |
| *** K`Tetch has quit IRC | 04:00 | |
| *** oshani has quit IRC | 04:01 | |
| *** nb is now known as zz_nb | 04:06 | |
| *** Fi has quit IRC | 04:13 | |
| *** zz_nb has quit IRC | 04:23 | |
| *** nb has joined #cc | 04:29 | |
| *** nb is now known as nb|away | 04:33 | |
| *** K`Tetch has joined #cc | 04:57 | |
| *** codergeek42 has joined #cc | 05:00 | |
| *** JED3 has joined #cc | 05:08 | |
| *** K`Tetch_ has quit IRC | 05:08 | |
| *** K`Tetch_ has joined #cc | 05:08 | |
| *** haoyu has joined #cc | 05:14 | |
| *** K`Tetch has quit IRC | 05:18 | |
| *** haoyu has quit IRC | 05:56 | |
| *** Fur has quit IRC | 06:06 | |
| *** trinity_4 has quit IRC | 06:14 | |
| *** trinity_4 has joined #cc | 06:20 | |
| *** jgay has quit IRC | 06:37 | |
| *** JED3 has quit IRC | 06:53 | |
| *** JED3 has joined #cc | 07:07 | |
| *** codergeek42 has quit IRC | 07:26 | |
| *** sama has joined #cc | 07:44 | |
| *** JED3 has quit IRC | 08:04 | |
| *** pyrak has quit IRC | 08:46 | |
| *** haoyu has joined #cc | 11:21 | |
| *** Wolfman2000 has left #cc | 11:50 | |
| *** trinity_4 has left #cc | 13:16 | |
| *** JonathanD has joined #cc | 13:35 | |
| *** Orango has joined #cc | 13:52 | |
| *** JED3 has joined #cc | 13:59 | |
| *** JED3 has quit IRC | 14:55 | |
| *** Orango has quit IRC | 14:57 | |
| *** K`Tetch_ has quit IRC | 15:11 | |
| *** K`Tetch has joined #cc | 15:11 | |
| *** JED3 has joined #cc | 15:51 | |
| *** jgay has joined #cc | 16:06 | |
| *** oshani has joined #cc | 16:07 | |
| *** stevel has joined #cc | 16:12 | |
| *** nathany has joined #cc | 16:15 | |
| *** inspe has joined #cc | 16:23 | |
| inspe | !cc | 16:23 |
| inspe | i need cc ? pls | 16:23 |
| inspe | !cc | 16:24 |
| JonathanD | inspe: email tips@fbi.gov, they can help you out. | 16:25 |
| *** akozak has joined #cc | 16:45 | |
| *** Bovinity has joined #cc | 16:46 | |
| *** jgay has quit IRC | 16:52 | |
| *** pyrak has joined #cc | 16:56 | |
| *** inspe has quit IRC | 16:58 | |
| *** jgay has joined #cc | 17:04 | |
| pyrak | i have a svn question: | 17:30 |
| pyrak | i want to merge a branch into the trunk | 17:30 |
| pyrak | can i do that without pointing to the actual repository? | 17:31 |
| pyrak | ie: svn merge /my/branch/name /my/trunk/name | 17:31 |
| JED3 | a merge won't commit anything, so using the remote location wont harm the repo | 17:32 |
| JED3 | you'll have to commit after the merge for any non-local changes to take place | 17:32 |
| pyrak | JED3, understood. still wondering whether or not i can just use local files though | 17:33 |
| pyrak | i mean, if not, i'm looking at a commit to the repo, then merge from files in the repo, then commit back | 17:34 |
| JED3 | oh okay | 17:34 |
| JED3 | well you can use a local path too | 17:34 |
| JED3 | svn merge -r 13:37 file:///home/pyrak/foo | 17:35 |
| pyrak | JED3, okay, so if i do that, then i'm merging two revisions of the same dir? | 17:38 |
| pyrak | 13 and 37 | 17:38 |
| JED3 | 13 through 37 | 17:39 |
| JED3 | so merge commits 13 through 37 on my branch at /home/pyrak/foo into the current working directory | 17:39 |
| pyrak | JED3, oooooohhhh | 17:40 |
| pyrak | so then when you look at the log, it looks like you started working on this branch after the last commit in the pwd? | 17:40 |
| *** JonathanD has left #cc | 17:41 | |
| JED3 | after the merge it will insert the revisions into your current tree | 17:42 |
| JED3 | so if you are on trunk and want to merge a branch in, you'll get all of those commits merged into trunk, it won't be squashed down | 17:43 |
| pyrak | JED3, got it | 17:45 |
| pyrak | thanks | 17:45 |
| *** K`Tetch_ has joined #cc | 17:45 | |
| *** sama has quit IRC | 17:46 | |
| *** K`Tetch has quit IRC | 17:58 | |
| *** Orango has joined #cc | 19:28 | |
| *** gimmulf_ has joined #cc | 19:45 | |
| *** gimmulf has quit IRC | 19:46 | |
| akozak | Bovinity: Is wordpress supposed to be stripping off background-color tags in divs i have on pages when I save the page, or am I doing something wrong? | 19:58 |
| Bovinity | akozak: it's very unfriendly with regard to style attributes and html things it doesn't understand | 19:59 |
| Bovinity | akozak: i've had better luck including a <style> tag, defining classes, and using class attributes | 19:59 |
| akozak | Bovinity: ok, thanks. I was hoping I could just do it all in the page. | 20:00 |
| Bovinity | akozak: yes, include <style> in the page. not 100% kosher, but you have to do what you can when it comes to WP, unfrotunately. | 20:00 |
| akozak | Bovinity: so I can't just specify a class in the div tag? | 20:01 |
| Bovinity | akozak: or you're just approaching it wrong, and should be defining things theme-wide. | 20:01 |
| akozak | That's possible. | 20:01 |
| Bovinity | akozak: you can do class="foo" just fine, but style="foo:bar;" is sometimes iffy | 20:01 |
| akozak | Bovinity: ok thanks. | 20:02 |
| *** gouchi has joined #cc | 20:37 | |
| *** akozak has quit IRC | 21:28 | |
| *** nb|away is now known as nb | 21:28 | |
| *** nathany has quit IRC | 21:45 | |
| *** jalljo has joined #cc | 22:43 | |
| *** oshani has quit IRC | 22:48 | |
| *** gouchi has quit IRC | 22:59 | |
| pyrak | Bovinity, ping | 23:01 |
| *** jgay has quit IRC | 23:18 | |
| *** JED3 has quit IRC | 23:24 | |
| *** pyrak has quit IRC | 23:51 | |
Generated by irclog2html.py 2.6 by Marius Gedminas - find it at mg.pov.lt!