labofsahil/github-event-dataset-2012 huggingface dataset:
Merge pull request #296 from harlowja/stable/folsom

Add the setting of force_cfg_drive nova conf value
Merge pull request #299 from harlowja/stable/folsom

Use search instead of match for image component finding
Removing some tests we don't need
Merge pull request #301 from gerardo8a/stable/folsom

Removing some tests we don't need
removing test_keystoneclient , it fails while testing, but we need to make it work
Merge pull request #302 from gerardo8a/stable/folsom

removing test_keystoneclient , it fails while testing, but we need to ma...
removing -P not used
Merge pull request #303 from gerardo8a/stable/folsom

removing -P not used
reverting back P change
Overriding method to avoid test failures
Merge pull request #305 from gerardo8a/stable/folsom

Stable/folsom
removing exclude for glance
Merge pull request #306 from gerardo8a/stable/folsom

removing exclude for glance
fix default value for instance_name_prefix
Merge pull request #307 from melwitt/stable/folsom

fix default value for instance_name_prefix
Testing command for glance to exclude test while bug https://bugs.launchpad.net/bugs/1065758 is fixed
Merge pull request #310 from gerardo8a/stable/folsom

Testing command for glance to exclude test while bug https://bugs.launch...
missing :
Merge pull request #311 from gerardo8a/stable/folsom

missing :
changing format
Anjuke Shenzhen xiaoqu
Changed the bottom bar to use a CSS gradient.
Restructured code and introduced left and right listeners
tests für symplectic steppers
introducing first flag in iterators
add shooter functionality
Update the binary autoloader.
Use custom version number to differentiate from regular pytomcrypt
Reset test buildkits DB in between runs.
Add tests for orgs with buildpacks:share and unshare.
Octopress init
Site updated at 2012-04-08 07:00:33 UTC
Add test for attr_accessible
Try renaming README to ensure formatting :)
Changes to comply with v2 manifest
Merge pull request #1 from housepage/develop

Changes to comply with v2 manifest
Fixes from Dan for accessing views.
Buildscripts: add backported argparse for Python 2.6 compatibility

https://code.google.com/p/argparse/

> based on the python 2.7 stdlib code, backported to older python versions
> provides argparse for everybody who still needs to support python < 2.7
Rakefile tests for existence of UFO’s
Version_number generation now smarter:

it checks:

- are there tags at all?
- does the tag confirm to the expected naming scheme (major.minor)?
- is the tag the latest commit? -> the version is major.minor
- are there commits since the latest commit? -> the version is major.minor.number_of_commits
''rake init'' generates a version number tag to start from
''rake minor_bump'' and ''rake major_bump'' create tags that bump version number

for example,
minor bump: 0.6 -> 0.7
major bump: 0.7 -> 1.0
Missing install in apt-get command
¡python-fontforge has become way more easy to install on OS X!

The Homebrew FontForge formula includes the python module now
Updated ufo2otf.py instructions accordingly

This should make the build scripts a whole lot more
accessible to OS X users: before the only way to get
fontforge-python to work on OS X was by building
from source.

The history:
https://github.com/mxcl/homebrew/issues/4689
Change namespace from MattEverson to ICSharpCode
Functionaliteit live presentaties
update verion num
made a better merged CSS file
removed obsolete unused test file
added working close buttons
Merge branch 'master' of github.com:illyr/searchbox-internal
better inputbox sizing management
1206bug补丁
xfooter style
make table horizonal header movable.
summary: Factor out addedAndDoneStat().
summary: Also print added / done stats for the day before.
summary: Reverse done number and text in output.

This way, the added / done numbers are directly next to each other, which makes for a better comparison.
correct search box for chrome
Update README.md
Merge pull request #34 from steve918/patch-1

Update README.md
Site updated at 2012-09-22 20:08:46 UTC
Still JAI dependency fixes
Add stunnel configuration
add recursive option in submodule update
notes after first run-through with Shai
Have a linker error with multiplication symbol
Adding mapping with Leaflet
give a meaningful error message (instead of a NPE) when the user inputs an incorrect folder id
more detailed logs (trace level)
Cleaned up the datawalk code
Cleaned up Amusement Park code as well as DataWalk code
Merge pull request #287 from jaypoulz/jp275

Major Queue-Uploader Changes
Fleshed out a testable version of ManualEntry -- prepare to suffer through a debug fest.
Important changes include the following:
- a structured process for the save button including adding a new DataSet to the que.
- a call to an upload sequence for the upload button
- a slightly overcomplicated manageUploadQueue() to handle queue in different situations
Stuff i forgot:
- still not passing an class id in our queueuploader intent
- haven't written the section that gets your locality from the gps data
Fixed intents
added debounce to displayResults function
Reverted LifecycleSteps to be per-story.  Added JournaledStoriesSteps.
Updated spring config.
Site updated at 2012-11-06 04:25:42 UTC
Better fallback when the active theme doesn't support Post Formats
switching to only starttime endtime as datetimes
Working on JPEG demo
XTSharedObject.attachWorker is no longer required - thanks Jason Williams
Fixed scheduler parameters, SO error conditions
Fixed JPEGEncoder - exit loops at beginning (where it'll start up again)
Working on JPEGEncoder test
working on JPEG test
Add rake setup task
Registering with Facebook, almost done
Use movementX/Y as only pointer lock dependency

This fixes various issues with different browser versions and different
pointerLock impls. This will also make the handler work correctly with
different versions of game-shim.
Update examples to use latest game-shim
Update function call
Do own pointerlock detection
Rename var
Do own movement property name detection
Save lookups
Don't change types
Update uncompressed build
Update compressed build
VLC: Fix/rename +qtcapture variant to +qtkit and rename patches

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Half broken matcher
Created Java solution
datechooser tested in 3.5.1
added transitions and random positions
Updated joda-time to 2.1
resolved conflicts
fixed WATERS parser bug

- station lookup was not dealing with missing 0 in input
- added test to run through WATERS Parsing
animation is added but still awful
fix to grails error message
* removed usnused packages
* default repository name is "model"
* tidy
* tidy
new package
Merge branch 'master' of github.com:jlarsson/Kiwi.Prevalence
link_to work
Role is on TODO list now
Implemented "rocketing." It's awesome!

May need to tune the mechanic and restrict when it can be used. I am
considering including a bonus mode where you can use it on the mode
with instructions.
Testing live compile fallback.
Adds tests for Evernote syncing.

Tests for the Evernote helper itself are still only sketched out.
Adds gems for Evernote syncing.
Prepares database for Evernote syncing.
Adds Evernote syncing functionality.
lagt till en banspec
Merge branch 'master' of github.com:johanjoensson/Komborobot
Tagit hänsyn till olika hastighet på hastighetherna
Change sample code to Node.js
Fixed bugs in pwd segment.
Use dir_lib variable.
Add custom path settings to rc-generator. #109
Added UTC segments to default themes (out commented). #110.
Fixed typo in lib/rcfile.sh
Updated AUTHORS.
Fallback theme should work now. #115
md syntax fix.
Remove modeline.
Use shell_is_x correct.
Configuration support for mbox mail count
Fixed lan_ip on Darwin OS (derived from BSD)a
Fixing for latest meteor
Improve sesion readme and add a licence
Update README with pip install instructions
allow to point to own hotpants exec
Update installsql.php

Fix creating userloginstatus table which is responsible in showing the online number of users in admin panel.
Final fix for wiki link

There's probably another way of doing this.
Add new block: Plant

This models a system of the form A(Z)/B(Z)
Fix identation
Implement matrix_print_pretty()

Matrixes are a pain to read if they're all in a line. A typical
output of print_matrix is this:

	[1.000 0.000 0.000; 0.000 1.000 0.000; 0.000 0.000 1.000]

This function provides an interface to easily print the previous
example as
	   A
	|1 0 0|
	|0 1 0|
	|0 0 1|

Where "A" is the name of the string. The format of the numbers
(%1.3f, for example) is an input parameter.
Fix segfault on NULL format for *_print_pretty()
Implement new centered title for *print_pretty()

A propper algorithm for printing the Matrix name centered.
Print extra space before number in *print_pretty()

But only if the number is >=0. This is to account for the '-'
before negative numbers.
Fix minor alignment issues in *_print_pretty()
Implement matrix_mul_safe()
Add missing \n in new_matrix() error message
Remove extra space in _pretty and defaul to %2.3f

This reverts changes from

commit 2e713d3a830354a65c4aeaeab093fbe3f32c1baa
    Print extra space before number in *print_pretty()

Which printed an extra space before positive numbers so that when
a negative number appeared, it would be lined with the positive

_1
-1

Where _ would be the extra space. The correct solution for this
problem is to use %2.0f, instead of %1.0f and adding spaces.
By using the propper format, any matrix can be properly lined up,
which is great.
removed the active admin
Feature panel source added.
Build version date fix
Moved latest games, pulling just tweets with a link to play.
Add stock symbols to stock table.
Where is my test folder?
Added narcissistic number generator for 12/14 blog post.
Updated to provide memoized versions as well as non-memoized.
Fail when requested unexisting, non-empty session id
Merge branch 'master' into ack
added offset getters
performance improvements in pathfinding and strategic location calculations
more changes with the message passing
no changes, just ran en_extra through sort before sending to the main espeak dev.
Adição de um podcast mais curto
Moved login-check in constructor
- latest changes to eligible reward
Merge branch 'master' of github.com:justformyfriends/Genesis
remove timeout from user
latest changes
latest change
Added list of rss feeds
separating independent functionality into traits
my first page
First github page commit
add jQM study note
mv jQM
add index.html
masterに移動
Auto refresh.
Fix conflict.
revert lock
Merge branch 'master' of github.com:kevinz/kevinz.github.com into source
add "read on" button
Launching Marked.app via <leader>m
Updating vim-powerline settings.
Parallelising system calls
Add fallback fonts to global style.
remove the show and index link in edit page
named_scope -> scope
move log filtering to application.rb, increase anonymity in logs
Update registration mailers to new mailer api
Turnaus -> turnaus
Files Updated changing the namespace
group_show test finished
Updated razor IMU
optional automatic delimiter detection
middle of adding team filter
Add team filter, add aThread.join(), use more threading in the filters
Finished Review ETL, improved Thread.yield()
숫자 입력으로 링크 이동하는 코드 추가

* 링크 이동 부분은 1995의 window.location 부분을 참고함.
* 링크에 숫자를 부여하는 부분은 id="link-%d"로 수동으로 세팅됨.
  차후에 class="link"를 붙인 링크에 대해 자동으로 숫자를 부여하는
  부분을 추가하면 좋을 듯
Fixed one off error in rating
[Javascript] [Jquery]
executionOrder reference changed to attribute.
Add ruby-prof to development environment
Provide 'mxcl/homebrew' as a constant
Use a different config for Unicorn in development
Updated dalli dependency to 2.0.4
builder: presto updated on behalf of mckelvey.patrick@gmail.com 7687: http://jenkins.cyanogenmod.com/job/recovery/7687
test7

Change-Id: Ib1d28ca5aea8381fae486eeb3581f500574d4154
Draft text similarly in reduced phrases
add test script and profile data
merge tied notes. fixes #10
nějaky commenty napsany
některy funce co byly jako public se nehodilo dávat uživatelum
takže se z nich udělaly private a vytvořili se kamarádi
Not needing the file-server as node static middleware is taking care of that
added If and Chain validators
Added helper method for title
moved mixins to partial, imported into sass-buttons.scss, updated sass-buttons.scss with button-group styles

Signed-off-by: Sam Ashley <sam@kwaledesign.com>
added grunt, qunit test, minified version, readme file
Refactored how to handle the state of whether a test is running or not.
included fs.extra
Don't use foreground colour from ImageThoughts
fixing wscript so it will build on current versions of stuff
renamed the package to something that seems unused on the registry
add Goalie position, switch number, pos
in-progress work touching index, coach views, athletes views
Merge branch 'master' of github.com:landakram/database-final
Site updated at 2012-10-08 05:59:11 UTC
fix: switch order of content
Removed compiler-kit-project.md, moved to CompilerKit repo
Updated about section for index.md
Make sure local installation directory is first in search for libraries and header files.
Check if LaTeX is installed on the system; only if this is the case, the PDF version of the manual can be generated.
Add dynamic load and remove slide, remove jump page
fix when result is undefined
SEO + Search style update

- Improved SEO by always making sure there is an H1 in all articles.
- Changed search to default bootstrap style using append. Had to remove virtually all original styles to make it work.
- Changes were to smart search. Need to do regular search next.
GitIgnore

Added gitignore file
FIX: Mock sys.exit instead of catching SystemExit exception
metascore parse
Puny code in disqus_url
Version 1 of a Polyphonic synthesizer made with marsyas. Currently can play 8 notes at a time. You can't change the notes. If you press the wrong button it might crash.
Merge branch 'master' of https://github.com/lgauthie/mar-oscillators
V2 of Polysynth. Now will a variable amount of voices. The pitch can now be any midi number.
Cleaned up style (4 spaces)
试试一下
input graph
Updated pom.xml with latest version of bukkit (1.2.5-R2.0)

Signed-off-by: licks92 <licks-laptop>
animating layer from haskell
started functional reactive programming
fixed ease in and ease out cubics
starting an animation when a timer times out
added an ImageObjPullStream class, which wraps an Image obj
added a polygon class
Tested point in polygon
File with marshalling of simple types
Curves.hs is literate now
Merge ../Matter4
initializer list for Polygon
use rotate_copy instead of two copies
some handy utility functions
fixed param order of vecDiv, and added vecSqrLen and vecLen
correct lhs indenting
added a convex polygon class, with a function to slice it into parallel segments
some polygon fixes, added a triangle class, and a function to triangulate convex polygons
result of GetParallelSlices now also keeps an index of the segment it lies in
implemented rendering of linear gradients
sign out works, ensureAuthenticated is set on /user/home
fixed typo
bug fix domain exists
Cleaned up a lot of classes to use properties directly. Modified the properties to be (strong).
Fix for occasional crash when switching away and back from a stop details view.
Merge pull request #16 from zac/master

Crash fix
add amqp extension to stable release 2.8.0
fix max PHP version of mhash extension
update to latest aws, and disable DNS check
Updated how BrowserServer searches for qbs QPA plugin.
Updated asyncCmdKey functions to pass int32 instead of uint16 values.
Stop using the __arm__ guard

Change the guards to be feature based instead of target
based.  This was creating build problems for devices where the
compiler defined __arm__ but the features were not present.
Merge pull request #33 from isis-project/stop-using-arm-guard

Stop using the __arm__ guard
Updated to properly compile with g_thread_init
Use QSettings to lookup location of schema files

Use appropriate default settings for embedded or desktop
Copy schema files into known location on desktop
Makefile cleanup
Adding support for passing the raw character(s) to the BrowserServer in a key event.
Merge remote-tracking branch 'origin/master' into find-schema

* origin/master:
  Adding support for passing the raw character(s) to the BrowserServer in a key event.
  Updated to properly compile with g_thread_init
Merge pull request #34 from isis-project/find-schema

Use QSettings to lookup location of schema files
change format from quilt to native
More changes for debianization of isis packages
Include sys/time.h in BrowserPageManager.cpp
updated instructions in README.md
merged README.md
updated to both server and src
Move extra coffee files to a new lib directory.
Update example config file based on code changes.
Split models and routes into smaller, more focused modules.
switch order of queue assignment
Validate username with regex instead of custom method
Add ability to sign in with email address
Oops, forget to remove
fix issue installing rubyracer
Merge branch 'hotfix/rubyracerfixes'
livecon glue test at aterpoo/suggest
edit post

2012-09-16-aplikasi-pengganti-di-meizu-m9
Dummy application intented to test the wxToolPalette during development. The project and workspace files are from Codelite ide
First draft of wxToolPalette user interface (toolpalette.h)
Adding reverse image for docks
Image hover change
Small change
Small change
SCV logo.
adding progress bar to upload
disabling upload button while uploading
adding error message
memory handling fix
digikam: Version bump to 2.9.0.
added button to append messages
added function to append messages
scrollbar styles and dummy button style
Site updated at 2012-10-19 16:24:04 UTC
Update mission list
Fix connection messages
changing default extension to .tpl
Mon Oct 22 19:21:23 CEST 2012
Removed boilerplate implementations of -dataOfType:error: and -readFromData:ofType:error: so that the SampleDocumentApp can be saved/read to/from a file, albiet without real data.
Added -setTitleBarBlock: method prototype to header file so that Xcode 4.5 provides full code-completion with block parameters.
Merge pull request #69 from andrewmichaelson/master

Changes to allow document saving/reading.
Merge pull request #67 from macguru/master

Disabled custom window movement when movably by window background.
Added last profile, profiles for all seven variables tested in 1D study.
fix: do not add lead coeff to factorization if it's 1
fix: do not compute factorization twice
chg: use FLINT in bivariate factorization
fix: deleted unused variables
fix: gmp 5.x does not define __GMP_BITS_PER_MP_LIMB any more which is needed in FLINT's longlong.h
fix: compiler warnings
fix: deleted unnecessary init of FLINT polys
fix: issues with building factory without NTL
chg: use NTL zz_p* instead of ZZ_p*, deleted unneccessary includes
new: containsAsFace for polytopes; fix: canonicalize() in gfanlib
chg: polymake.lib, divisors.lib

renamed polymake.lib to oldpolymake.lib
divisors.lib will now load polymake.so if it has not been loaded yet
fix: divisors.lib getDualCone->dualCone
chg: allowing minkowski sums between polytopes and cones
chg: new, clean gfanlib

the old gfanlib version had some makeshift code written by me inside of it.
As Anders has no intention to fully support some features I added in a makeshift manner
(because they are redundant for the computations done in gfan)
and polymake already has them properly coded,
I removed the makeshift features from the code
and will outsource them to a new cone type for people who have polymake installed.
fix: bad use of term ordering wp

replaced term ordering wp with a suitable matrix ordering,
because sometimes wp would be called with a unsuited weight vector.
Merge pull request #102 from mmklee/factory_fixes

Factory fixes
Merge pull request #104 from YueRen/gfanlib

Gfanlib
move polymake.lib ->oldpolymake.lib
entry: finish backspace command.
added MOTP sample
fixed minor issue, with time ranges

motp is working with ranges for 10 seconds. means that the token for
second 10, 11, 12, ... , 19 will be the same.
so to make sure we have to test tokens in the range of 40 seconds, not
31, 32, ...
Remove "error" attribute
Merge branch 'master' of github:marcusramberg/mojo-redis
Fixed issue where parallax functionality was broken in IE7 and IE8. This occurred when parallaxing elements were not given a left margin, which non-standards compliant browsers read as "auto" instead of "0px". This value would then be fed into parseInt. parseInt("0px") returns 0, whereas parseInt("auto") returns NaN.
Tweak Malchata's IE fixes
Copying System.Web.WebPages locally.
add nullstmnt
Update vendorsetup.sh

add encore
Asset link index on UUID columns
ROADMAP
removed the container
removed the container references
ROADMAP UPDATED
Merge branch 'feature/remove-deps' into develop
Diff object with clean constructor
version 0.9 in readme
removed di and config in readme#dependencies
packagist link for process component
Merge branch 'hotfix/v0.9.1' into develop
Merge branch 'hotfix/v0.9.2' into develop
composer update
version bump
Merge branch 'release/v0.9.3'
matt does this work?
Merge pull request #2 from matthewcopeland/makeover-one

Makeover one
use FEX_flash rather than flash
Sync .html changes back into .haml
upgrade jquery
add in-symbiote highlighting of selected views
fix layout bug with input widths
Merge branch 'master' of github.com:moredip/symbiote
Code cleanups. Cleanup of disc intersection algorithm. Support for LEAF_DATA in local memory (copy once). Fix auto tuning.
bugfix for lib-dynload stuff when switching venv's
replacing parent with parentObject to prevent confusion with global parent (being window)
Adds better python code formatting.
Updated readme with info about 1.1
Add Development Roadmap link
Add links to VC2008 Redist
ignoring vim files
adding rails assets
adeed host_config.sh
Fix security_group access. Thanks to EY ticket #52840.
CLRS implementation
Adding factory_pal 0.1.1
Merge branch 'master' into patch-2

* master:
  Revert "fixed adding --enable-fpm to PHP_BUILD_CONFIGURE_OPTS"
  use keyword argument 'username' for ctx.sudo()
  updated example fabfile.py
  fixed adding --enable-fpm to PHP_BUILD_CONFIGURE_OPTS
Merge pull request #7 from janpieper/patch-2

fixed exporting PHP_BUILD_XDEBUG_ENABLE
Urly 1.0.0-rc6
Remove crawlista.url/normalize-host

Not only it is sometimes a risky operation, it is really what Urly should be handling (and as of rc6, it does)
Remove temporal tagging
Refactor URL extraction to use functions moved to Urly (where possible)

Only 3 initial test cases pass, other need expectation updates
Make case 3 pass
Finish updating expectations
Automatic documentation commit
Added key expiration caching for posts
Renamed favicon.ico to favicon.png
Merge branch 'source' of github.com:mikeys/mikeys.github.com into source

* 'source' of github.com:mikeys/mikeys.github.com:
  Renamed favicon.ico back favicon.png
sticky subnav! boom!
Moved date,time serial printout to sub-function

Also re-arranged the pre-amble for readability and
removed some older commented-out code.
Inserted code to return to home position

Added a while loop in the setup loop to bring the sled
position back to the home position at the upperLimitSwitch.
This will run until the upperLimitSwitch is activated. This
gives the program a constant starting position on each
reboot.
Switch fundamental logic of heightDiff

Changed the sign (plus/minus) of the heightDiff
calculation. Now the value will be positive if the
water level needs to increase (tide is rising) and
negative if the water level needs to drop (tide is
dropping). Still need to implement the limit switch
logic.
Implemented new logic tests for moving motor

The decision to move the motor now relies on checking
that the new target position is within both the lower
and upper limits of the rack, and that the appropriate
limit switch hasn't already been activated.

Also modified the conversion factor for distance per
motor step to work with the 10tpi lead screw.
Shifted limit values

The upperPos and lowerPos values can be shifted so that you
end up with a height window that encompasses the current
tide height. This makes initial trouble-shooting quicker than
waiting for the tide to enter your actual tide range.
Updating comments

Also sped up the return-to-home movement during the
setup loop, since that often takes a long time.
Added a single delay during setup loop.
Updated position buffer in the movement logic
Updated TODO.
Fixed the deps ordering.
Added utilities and tests for generating HTML from RST.
Added some content for the open source page.
Added support for rendering RST content as Twisted Stan tags.
Rewrite pack.js. Add resize events.
categoryを消してみる
Atualizando modulo mix e colocando secret token para sincronização de banco de dados
Removendo link www e atualiznado modulo mix
Clean up serializer code, handle NSURLs and NaN NSNumbers, as well as unknown objects in sets
v1.3.1 readme: better handling of non-standard datatypes
Comments and Fixes.
Rewrote how 'e' was being generated so that the probability of 'e' being
any possible number, within the interval of [0,2^numBitsInPhi-1], is now
uniform.

Added additional comments to the code.
Serialization ID Added.
New Constructor.
Added a new constructor to the RSA Class for allowing initialization via
strings.
add pod coverage to BUILD method
remove unused variables
make "see also" note in SYNOPSIS a separate section
Site updated at 2012-12-14 22:00:52 UTC
Twetter
locuraaaa
Added python script for generating a Makefile to build packages in the right order.

Also, cleaned up a little and renamed the existing pyhton script to
contain _ instead of -.
Added support for new stack.xml format in get_stack_dependencies.py
fix ensure_not_seen_relic method
Merge branch 'dev' of github.com:monterail/otwartezabytki into dev
Added tag THUNDERBIRD_10_0_6esr_RELEASE, THUNDERBIRD_10_0_6esr_BUILD1 for changeset b2b6a37879f2
iBug 773808 - Cannot run ./configure to create Thunderbird source tarball. r=aki
bug 757419: Point moz2-darwin10-slave02 to the proper puppet master. r=rail
Site updated at 2012-10-10 05:07:24 UTC
dialog/window xml reading
restyling the overview
add top right bar
diplomacy dialog
minor fix sintassi html
minor refactor
minor markup fix
markup
Added missing -rdynamic. Works well now.
Making map larger
Adding virtual remote functionality for Frodo.
upgrade to the latest version of jermaine
remove old binary, update readme
removed build properties
Implemented the rest of Step4 and cleaned up some duplicate code
swapped step 2 and step 3
Merge branch 'master' of github.com:TestStack/TestStack.Seleno into samplestep4
Added licence
added DOTrvmrc
rm troublesome gem dependency
fixed regression with sdd generator, and 2nd level cleanup
Add nodejs class to define resource type.
Fix bug when npm does not exists on system.
这应该是最后一次更新了，河蟹了敏感词，增加了一段话
update gucun post
Added command line arguments for file paths.
first commit
Merge branch 'master' of github.com:nathanyhm/pythonlearning
MBS-3748: Fix bad merge conflict

tsk tsk, navap
Refactor translator. Add support for anonymous fns.
Allow to use string in expressions.
Converted tabs to spaces
Column picker improvements: no longer hiding on mouse over, instead requires a click outside of menu; added css icon; changed default text of button
ispravljena greska u kucanju
Adaptando ao novo site da CBSS
resolves merge conflicts
resolves merge conflicts
 strings ausgelagert
Remove the comment, ughhh
Have to bump to 0.9.1
add a note for ffmpeg versions
Updated Lightning Talks (markdown)
Updated Lightning Talks (markdown)
modified:   Lightning-Talks.md
Merge branch 'master' of github.com:newhavenrb/railsconf2012.wiki

Conflicts:
	Lightning-Talks.md
Added dtmf passthrough support
10 - Moving between activities
Change player play-cursor to be minumum possible width of 1px

Previously it was based on a percentage of screen width, which started
to look silly on very large screens
Controller::Audio - override umask for cache directory creation
brought window class into state of near completion
removed Dictionary interface as it was decided that it was unneccesary.
minor seed changes
Update for 2012-10-11

- About page renewal
- Added current .htaccess
- 日本語トップページからのリンク先を、はてなダイアリーからサイト内へ移動
removed throw statements in serverside js
Merge branch 'master' of https://github.com/nivekbackwards/CoolPaint
Ajustes5
Added a script for opening external links in a new window.
create new file about perl
Optimizes handling of sub-managers and adds calls to their sub-managers if available and necessary
NXP-9129 add missing Quartz PRIORITY column
Merge pull request #3 from ron1/FEATURE-NXP-9129

NXP-9129 add missing Quartz 1.6 PRIORITY column
Merge branch 'master' into feature-NXP-9432-connect-channels
require foursquare2 gem before using it
require foursquare2 gem before using it
changed answer color to red
brought in my own templates by cloning the built in templates and over-riding them
add java train to techbakery
modify arrow in compressor
INT-2434-v3 polishing based on comments and discussions with @markfisher and @garyrussell. Added support for disabling aut-creatioin of channels
Switched to calibre's built in cleaning mechanism to avoid weird issues with Readability website

It looks like Readability is changing there response randomly to discourage fetching automation

Too bad; good thing is that Calibre has cleanup argorithm that is based on same ARC90 algorithm.
Still, Readability has more advanced version of it, but can't use it if it is not reliable.
Fix SSl timeouts occuring with libcurl 7.25.0
スライドの調整
deleting the image
removed generated votations xml wrongly pushed to repository
disable security for profiler
js in pipeline
right images path in sass
mv _formtastic.sass -> _form.sass
+gem openteam-commons
browsing styles & js
add extention for some zivf files
Adding Rollo demo. Work in progress.
Merge pull request #224 from miketaylr/viking

Rollo the Viking
[CHEF-2871], [CHEF-3295] - update Ruby/RubyGems

* Update Ruby to version 1.9.3-p194
* Update Rubygems to version 1.8.24

Users will need to update their .gemrc if they are using SSL and do not
have a globally valid SSL certificate, per RubyGems 1.8.23.
update bundler to latest for bundle install performance improvements
ENOVERSION: bundler 1.1.15 :(
Merge branch 'solaris' into performance-improvements
Merge branch 'master' into performance-improvements
need psych to eliminate warning
Merge branch 'performance-improvements'
gitignore for eagle cad is added
redoing permalink structure
Rebalancing left
0000300: Participant status report in Supervisor mode shows all sites
Forgot to remove debug code
Refactoring site restricted lists
Merge branch 'release-1.1.1' into develop

Conflicts:
	api/ui/pull/participant_status_report.class.php
Handle bad json cases
improved: code now a bit more readable
Fixed FC bug for non-Xperia Plays.
{% endfor %} missing
Use AssignReads2 in do_tux

Somehow, this used to be in there, but after approximately a183622c,
this got lost in a merge. Now it's back.  So there, fuckers.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch PAC45
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   do_tux.py
#
- Relatório teste
 - Relatórios
 - Versão operacional do relatório testada na versão Bi Server 4.5
A Javascript-based interface to add inlines is now included.

The original javascript was written by Nathan Borror for his
django-basic-apps (which django-inlines is forked from). The
functionality to insert the inline at the current cursor position comes
from [gclagorn's Stack Overflow
answer](http://stackoverflow.com/a/1064139).
Updates to mobile device css
pokes don't heal between battles, wild pokemons
.
only remember hp loss of RPG teams
wild pokemon scripts only use valid moves

They also only trigger if you have the name 'Wild Pokemon'
Merge pull request #14 from coyotte508/master

Wild pokemons
fixed david bug
fix david bug
fixed david bug
link to meteor
Added Sample Code for Simple Tokenization using Stanford NLP
request route information one at a time
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/mo/mo.js
1800
sinc
Socket-based, multi-timer DMX dimmer/mixer
add post for howto-bulk-import-dns-zones-to-softlayer-dns-using-cpanel
Removed stuff that shouldn't be here.
added subsurface scattering function
testFour written and failing
Cleaned up AssemblyInfo and signed assembly.

Assigned a correct version number to the assembly and created a new Key.snk to sign the assembly.
Added readme and presentation docs
Oops - implement the default filter properly
get rid of a helper
update 1
update readme
update 1
Merge branch 'mod_PL_NO_SHIPS' of https://github.com/radius75/Pioneer_mods_PL.git

Conflicts:
	Readme.txt
	ships/4_eagles.lua
	ships/adder.lua
	ships/asp_explorer.lua
	ships/boa_freighter.lua
	ships/caribou.lua
	ships/cobra.lua
	ships/cobra3.lua
	ships/constrictor.lua
	ships/flowerfairy.lua
	ships/hammerhead.lua
	ships/imperial_courier.lua
	ships/ip_shuttle.lua
	ships/ladybird_starfighter.lua
	ships/lanner.lua
	ships/meteor.lua
	ships/natrix.lua
	ships/sidewinder.lua
	ships/sirius_interdictor.lua
	ships/stardust.lua
	ships/static_ships.lua
	ships/talon_military_interceptor.lua
	ships/turtle.lua
	ships/viper.lua
	ships/viper_x.lua
	ships/wave.lua
Added AutoScale.lua
removed excessive test files
added tests, edge manipulation functions
FINAL V
backup for update
merged
sumaRango: recursiva e iterativa
Removed deps.txt from the repository as it's just a generated file.
client/service separation
Cleanup methods should be class methods
Update gemspec with the right info
Bug fixes and 3d in all inspector instances.
consertando erro em views.py
Merge branch 'master' of github.com:renatooliveira/avaliacao
alterando backend da avaliacao
完善路径
Site updated at 2012-06-02 19:33:20 UTC
changed versions, updated readme
Update recipes/modules.rb
The errors in the validation callback is now an array of objects containing the id, name, and message.
Update fiber/templatetags/fiber_tags.py

django 1.3.1: 

````
# django.template.base:

...

# line 813
class Library(object):
    
    ...

    #line 866
    def simple_tag(self, func=None, takes_context=None):

        ...

````
doesn't expect a `name` argument.
Merge pull request #114 from airtonix/patch-1

Update fiber/templatetags/fiber_tags.py
Added a few more test files to clean up.
Refactor: Removed spurious -r's on diff calls for simple files.
vm acceptance test cron job bash script tweaks.
Clean up cloud names and re-set defaults for yaml file
Improve googleput visual feedback.
save bump version number and removed the raise and rescue
Delete image (old theme)
Delete old javascript
Delete old stylesheet
Twitter Bootstrap (js, css)
css for css3 loader and classes for table cell
Modal window for select columns
Empty view for start page (root)
Big update of beautiful scaffold (version 0.1.0)
Upgrade number version
Patch to render willpaginate with Twitter Bootstrap
Icons for bootstrap
Corrigindo Helper de busca de City no cadastro de Company
removing the default value for the $title attribute
WIP: dri2video (v3)
Proper URL encoding
Corrige bug no index
Can now place Gun Traps

Gun traps can now be placed, and only in places where it makes sense.
Balance has been retuned so that victory is possible (that is, passive
dominance without losing any lives) but is not completely trivial.
fixing the haml alias to be better about dependancies
Rebase from release/rosout
+ Creating debian mods for distro: oneiric, rosdistro: groovy, upstream version: 1.9.17
+ Creating debian mods for distro: precise, rosdistro: groovy, upstream version: 1.9.17
+ Creating debian mods for distro: quantal, rosdistro: groovy, upstream version: 1.9.17
Rebase from 'release/roscpp' @ version '1.9.34'
Generated debian files for oneiric
Rebase from 'release/roswtf' @ version '1.9.38'
Generated debian files for oneiric
Rebase from 'release/test_rosgraph' @ version '1.9.30'
Generated debian files for quantal
Rebase from 'release/rosmaster' @ version '1.9.29'
Generated debian files for quantal
Updates to the docs and added a test.
Se corrigio error de SessionProvider Mongo

Habia un error en la obtencion de la cadena de conexion por el session
provider
fib test
fib shoudl return an array
fib should return an array
Checking od Redis presence on each iteration added
A few minor bug fixes
Merge branch 'master' of github.com:russellporter/WhyJustRun
Apple touch icon
Empty crossdomain.xml
added more logging
added dependencies on HTML::Parser and JSON
Added utils.go with sparse counter code
Fixing concurrent execution. It turns out to be a nice (and important) feature, to execute more than on reval -- you can pause what you are doing, zoom in on one aspect, then go back to the original regex with the new knoledge intact.
SAK-22891 mega-help merge into 2.9.x


git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@117720 66ffb92e-73f9-0310-93c1-f5514f145a0a
https://github.com/igrigorik/hackernews-button
Added SuperTab and SnipMate
catch SVG graphics exception
change to batik 1.7
Merge pull request #114 from tcarver/master

batik 1.7
Atualização da documentação da API. ps: ainda está inacabado
Finalizada a documentação da API
- Moved normal keyboard handling to clothSimulator
- Moved normalKeyboardRelease to clothSimulator
- Moved specialKeyboard to ClothSimulator
fixed references to nsarray group and categories
Added string function and cleaned up some variables.
Change isearch prototol: client provides search root instead of making servlet look for it.
testing
updated
Demo file

Demo file
Demo file
Design Mockup
Merge pull request #8 from Ruva/master

Design-Mockup-V0.5
Added final design document template.

I've written up a template for the final design document, but
until we have our requirements meeting today, I'm not putting
anything else in it.
Site updated at 2012-04-06 17:28:00 UTC
adding exclude property for 'toaster.coffee' config file
adding function util
0. Adding multi-folders support and package 'alias' for more structural flexibility
1. Adding new example using multiple
2. Updating examples
making toaster multi-toastable
# fs-utils.coffee
	Adding -L option to search in order to follow
	symlinks (users must to be free use simlinks).

# toast.coffee
	Fixing builder instantiation time.

# builder.coffee
	Triggering build and watch at the proper time.
huge update to fit some of theoricus needs
adding 'lib/toaster' to .gitignore
recompiling examples
accepting config as an option object instead of cs string
refactoring the hell out of fs-util and improving builder a little to talk with it
more fine-tunning in fsutil class, handling listeners properly
improving expose routine in builder and script, also optimizing output code
using the 'expose' property in the two examples
recompiling examples
recompiling toaster
renaming existent examples
adding 'config-file' property
recompiling
adding introspection example
update comments
finalise v0.3
starting work on the actual synchronisation code for rhizome direct.
Added note regarding new architecture to existing comment. #1
Wrote function to get a range of BARs from the Rhizome database
for use in Rhizome Direct synchronisation requests. #9
removed defuns
Updated rinari to also setup ruby-hacks
Enemies and damage and HUGE FUCKING BULLETS WOOOO
more queries grouped into single transaction, proxy cleaned up
more queries grouped into single transaction, proxy cleaned up
Updated the Todo list
Rebased on latest Greybird
Move evaluator config templates into samples/config
Merge branch 'master' of github.shuttercorp.net:shutterstock/bristlecone
Added some needed handlers.
Moved edits Chelcie made to aSong into one-piece.
Added alias for RokClock log edit
change for min js
ING

ING
regen with latest Automake-NG

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Spring Social Project
Adding lesson 2 section 6 -- compiler with note, seq, and par
ActivityManager: Fix getCurrentUser() transaction

It was actually invoking switchUser()

Change-Id: If9ab9effa4816c12d14d8f53df4ab131ac320d0c
json, avro compression
Contact info added.
Site updated at 2012-03-20 10:20:30 UTC
Site updated at 2012-12-11 09:35:55 UTC
added ios-store submodule
added ios example projects
ignore my Features.txt file because it's just noise
doc tweaks on +.sonify and print.sonify
first maven buid
added composer.json and changed autoloader conf accordingly
Entering a new page
Add all files
Shell for group collector app
Fix filename escaping
Add specs for filename escaping patch
Merge pull request #22 from mikesager/master

Add missing filename escaping.
OOps, not coffee-script.
Horizontal and vertical item spacing
share button moved to bottom.
画像を追加。guide.jsonの整備
Dependencies statistics and Header assignment and Memory Use
Updated link to user guide in readme.

git-svn-id: http://plugins.svn.wordpress.org/import-html-pages@630513 b8457f37-d9ea-0310-8a92-e5e31aec5664
Dialogi w wybieraniu frakcji
add user action tracking code
Merge branch 'master' of https://github.com/tacitia/BrainCircuitsViz
added udp socket to test stream from max4live
Merge pull request #3 from tailwinded/develop

added udp socket to test stream from max4live
removed redundant flatpage templates, removed related redundant functions in ui.js
fixed conflict in ui.js
js and css tidy up
Rework JS to be neater
Restructure IE-handling code into oscar object

When we refactor variant products, this code will be dead.
Remove jquery.easing plugin

It doesn't seem to be used anywhere and is loaded on every single page.
Move oscar's JS into base.html

Also move the initialisation call into a block so it can be overridden.
Having it in the JS file itself feels too tightly coupled.
Document elastislide usage

It wasn't clear to me why this script was being loaded on every page.
Merge checkout.js into ui.js
Split plugins.js into constituent parts

I think plugins.js was a case of premature minificication.  Better to
store the plugins separately and use a compressor library to handle
concatenation and minification.

I put the plugins in their own folder for consistency with the plugins
that require extra assets (CSS, images).  Not sure if that's right.
Add conditional <html> tags (from modernizr)
Merge nav_alternate.html into nav_primary.html

Removing lots of duplication.  Now using a variable to control whether
the dropdown is open or not.
Add makeFormPretty function

Every form calls this upon form load.  Any future beautification code
can be handled here.  Right now all it does is assign a hand icon to all
clickable objects.
Vastly improved zoom values

Several things:
1) Zoom order now matches GIMP, Paint.NET, etc - high values are at the
top, low values at the bottom
2) Zoom values are no longer ratios of 1 (1:2, 2:1 etc).  They are a
hand-selected assortment of useful values, based somewhat off values in
GIMP, Paint.NET, and various parts of the LibreOffice suite.
detailed test failure messages
removed free-loops.com
add set user role methods and controller methods and related test
Working towards a revised REST API.
preparing to move to git-flow
Making jQuery local, moving over markup
use unicode in foreign title source factory
Updates to source player addressing.
Updated filename.
Changed type filter from points of interest to food
Added plenty of mathematical stuff, and types
signing in is now signing up through shibboleth
0.2.0 support to merely alias commonJS modules to be loaded from specific path
Added a sample rspec spec + a rakefile to run the specs
TheMatrixV1
major refactor, cleaned up game
Make Instantly packaged correctly
Make Instantly packaged correctly
added timeout when connection and sending a command (3 sec)
Make lastfm/xmpp info plugins more robust
Ensure that we do not draw branching primitives under QtCurve.
Merge pull request #108 from teo/master

Workaround to force QtCurve to not draw branching primitives in SourceTreeView
still some CHANGES.txt fixtures
Cleanup, for goodness' sake!
Allow for https

Update content script matches regex to include https. At least for me,
news.google.com is always redirecting to https now.
Merge pull request #1 from annie-l/https

Allow for https
LGEQualcommRIL: Fix dataCallState objects
Change-Id: I5f36370981737200de808922bd6772a08dc85608
[rmcc]
include low battery percent with lockscreen percent option
[whitehawkx]
Remove deprecation on android:enabled attribute.
The android:enabled was never deprecated and replaced by
android:state_enabled as it was mentioned in the documentation.

The attribute android:enabled when applied to a TextView (or its
descendants) still works until now. In fact that's the way to
disable widgets from layout XMLs.

The deprecation made ADT and lint suggest users not to use this
attribute.

Change-Id: I5e7d7060d9e79a04342ebc723d7937b9bc12a018
Signed-off-by: Yuku on yuku4 <yukuku@gmail.com>

Signed-off-by: travp624 <stygianstudiosdevs@gmail.com>
Merge pull request #50 from travp624/384c5225b652ad55710894f129401a8770af58cb

Remove deprecation on android:enabled attribute.
Seperated answers from question. easier to read in markdown
allow KeyboardInterrupts to be seen when waiting for events
add spec
fix deprecation warning of formtastic
WIP: manage reservation
delete jquery-ui
Roundtrip tests with eval and Data::Undump
make ddl_dump_pv emit the double quotes
restructure dq so most of the ifs go away
various tweaks and improvements, mostly related to string handling
Tests und Kommentare hinzugefügt
Fixing statistics test
拡張子を小文字に修正
Added CLDR library, mainly to remove the annoying i18n warning
Fixed colorbox close button and made "explore" button close window
Bump package to 1.0.5
Updated demo, configuration
Track label in logs
Require at least one vertex in all regular skims
PEP8
Merge pull request #115 from uwcms/vertex-req

Require at least one good vertex in skim paths
update of egamma pog recipe to get latest EAs
change recipe more conservatively
Merge pull request #83 from lgray/master

update of electron EAs
removed uneeded print on tryJoin fail, always prints on first stop
clarified mutex ownship in verbose prints
added isCurrentThread)_ & isMainThread()
Merge remote-tracking branch 'upstream/develop' into develop
reverted ofSemaphore addition
reformatted comments to match OF code style
merged ofxiOS into ofxiPhone
added iosNativeExample to show to get OF apps running inside a native ios app.
removed Default.png and Icon.png from iosNativeExample as they will be added when the project is generated.
instead of setting ofxiPhoneViewController as root view controller,
ofxiPhoneViewController's view is now added to the window.
this allows for other views to be added to the window over the top of the ofxiPhoneViewController's view, as is currently done by some ios OF examples.
Merge pull request #1053 from julapy/feature-1049-ofxios-merge

merge ofxiOS into ofxiPhone
fixes for project generator ios crash. small cleanup of iosNativeExample
Merge pull request #1031 from danomatika/develop

ofThread rewrite & ofSemaphore typedef
Merge pull request #1035 from joshuajnoble/master

adding multiple i/o devices to rtSoundStream
fixed a small bug with the XIB being linked to the wrong file owner.
Merge pull request #1060 from julapy/bugfix-683-iPhoneGuiExample

bugfix 683 iPhoneGuiExample
Merge branch 'develop' of https://github.com/openframeworks/openFrameworks into vanderlin
Site updated at 2012-10-20 15:07:23 UTC
Implemented recognition of all required gestures & saving to the user defaults.
small changes to Optimization script
Merge branch 'master' of https://github.com/vellamike/Optimal-Neuron

Conflicts:
	examples/basket_cell/src/optimization.py
conflict fixed
working out bugs brought on by the latest update to inspyred
changed default values
deleted unecessary files
Updated to jade template for index
made changed in both model
release Windows binaries (7.3.681)
Added underbudget-dist submodule to create distribution packages.

Created generic zip package (readme and jar) for Windows (closes #94).
Created generic tar.gz package (readme, jar, data files, scripts)
(closes #93) and an Arch AUR PKGBUILD.
Merge branch 'issue-94' into develop
Site updated at 2012-10-17 06:52:45 UTC
Incrementing version
Adding left/right methods to swiped events
Adding calendar month element and dialog
Adding accessor for display
Write configuration file on install. Fixes #17.
Measures to adapt framework to changes
Uncommenting tests
Changin environment
asfa
Update Rack Topogloy after VM is powered on during 'cluster start'
moved recent games title within conditional
fixed stream link index page
updated api/stream stream name lowercase