labofsahil/github-event-dataset-2012 huggingface dataset:
Support merging of updated object state on collection add.
adding KANO/GAMES as an example app
Correct minor mistake in todo example.
Merge pull request #1239 from philfreo/master

Collection.clone()
Merge pull request #1220 from folded/master

Optionally merging updated model state on collection add.
tweaking duplicate model merge:true
adding tests for merge:true
Fixes #1223 -- new attributes left behind after a failed wait:true
adding a test for the previous commit -- failed save with wait:true
Add tests for #1122.
Use the same type of URL for installation instructions.

Currently docco points to the github web page, while
coffee-script points directly to the HTTP git URL.
supporting url params in browsers without pushState support when pushState is enabled
removing ds_store -- should be added to .gitignore...
add link to Walmart Mobile
Merge pull request #1260 from zamiang/push_state_unsupported

Fix #1252 - Backbone history with pushState enabled incorrectly handles urls with query params in browsers that do not support pushState
Merge pull request #1258 from syntacticx/master

Adding Walmart Mobile as an example
shifting the Walmart mobile down a teense.
point to CoffeeScript.org for installation instructions
Merge pull request #1257 from benatkin/patch-1

Use the same type of URL for installation instructions.
Whitespace cleanup for extend Collection.prototype.chain function definitions.
Changing seatAvailability URL to regular one from the test one (without _new)
Adding some intro text when you copy routes, mmentioning which app the text was copied from
new file added
Merge branch 'master' of github.com:phresco/Test-Repo
new files commit
artf516490 : Xcode plugin changed, adapting it in UI.
Merge branch 'master' of https://github.com/phresco/framework
artf516573: CST Defect - Failed testcases not shown in iPhone Functional Test Execution Report
artf521372: Only one testsuite report is available in the pdf report even when there is a number of testsiutes.
Merge branch 'master' of https://github.com/phresco/framework

Conflicts:
	phresco-framework-web/src/main/java/com/photon/phresco/framework/actions/applications/PhrescoReportGeneration.java
artf526619 : import from git integration in phresco
[artf557005] exception constants added
improved security on signatures
update pom for commons-lang
display a sample spec defaultly and leave a interface for the signal of normal display
Feature refactoring
DialogueAnswerExpected-Feature
DialogueAnswerWasExpected-Feature
DialogueAnswerWasExpected-Feature (Typos)
Partly removed dependencies + ShowingPlace-Feature
Merge remote-tracking branch 'origin/master'
fix png exceptions
RAXAJSS-69 Registration - Registration - Returning Patient: search through patients in OpenMRS database using rest call
rearrange pixel filling
docs and more sensible default
larger #points
new
options=date
started adding a mask to aid in better tapering
checking back in an older change to add weight optiono
Added terrain fixing code
Merge branch 'master' of https://github.com/player1537/TSAVGD
- Rebuild with DB 5.3
- release 13 (by relup.sh)
Updated the readme.md so it now describes the method readdir
Merge branch 'master' of github.com:lindstroem/node-dbox
ermove .c9 files
Resolved issue on error in many methods when an error is returned.  Callback was attempting to parse invalid data
version bump v0.5.4
Merge pull request #42 from jeremycondon/master

Fixed dbox crash issues in callbacks when errors are returned from server
adds Jeremiah Condon to contributer list
Merge branch 'master' of git://github.com/sintaxi/node-dbox
Updated to the sintaxi/node-dbox
Updated get method, so it now follows the rules set in the pull request #15 (return null if error). I've also updated thumbnail so it also parses the x-dropbox-metadata like the get method (issue #37) and corrected a bug in metadata also related to pull request #15
version bump v0.5.5
Merge pull request #40 from lindstroem/master

Updated readme file & fix for issue #40
Merge branch 'master' of github.com:sintaxi/node-dbox
touched up .gitignore file
updates CHANGELOG.txt
evolving GA parameters with individuals
playing with self adjusting fitness function
fixed fitness, normilized it's components
trying other entry points
Added README, LICENSE, and Lisp->Java communication.
add 'composition of relations' link
Articles sorted out almost done
Article some what working
oracle jdbc driver & docjure added.
flexigrid added.
some hogehoge working file added.
Update example of process titles shown by "ps".

This example was quite old: it lacked the WAL writer and autovac launcher
as well as the more recently added checkpointer.  Linux "ps" seems to show
slightly different stuff now too.
Refactor the way code is shared between some range type functions.

Functions like range_eq, range_before etc. are exposed at the SQL-level, but
they're also used internally by the GiST consistent support function. The
code sharing was done by a hack, TrickFunctionCall2, which relied on the
knowledge that all the functions used fn_extra the same way. This commit
splits the functions into internal versions that take a TypeCacheEntry as
argument, and thin wrappers to expose the functions at the SQL-level. The
internal versions can then be called directly and in a less hacky way from
the GiST consistent function.

This is just cosmetic, but backpatch to 9.2 anyway, to avoid having a
different version of this code in the 9.2 branch. That would make
backpatching fixes in this area more difficult.

Alexander Korotkov
Resurrect the "last ditch" code path in join_search_one_level().

This essentially reverts commit e54b10a62db2991235fe800c629baef4531a6d67,
in which I'd decided that the "last ditch" join logic was useless.  The
folly of that is now exposed by a report from Pavel Stehule: although the
function should always find at least one join in a self-contained join
problem, it can still fail to do so in a sub-problem created by artificial
from_collapse_limit or join_collapse_limit constraints.  Adjust the
comments to describe this, and simplify the code a bit to match the new
coding of the earlier loop in the function.

I'm not terribly happy about this: I still subscribe to the opinion stated
in the previous commit message that the "last ditch" code can obscure logic
bugs elsewhere.  But the alternative seems to be to complicate the earlier
tests for does-this-relation-have-a-join-clause to the point where they can
tell whether the join clauses link outside the current join sub-problem.
And that looks messy, slow, and possibly a source of bugs in itself.
In any case, now is not the time to be inserting experimental code into
9.2, so let's just go back to the time-tested solution.
Test if $root is a directory.
initial version

Add 'VA' prefix to antenna names for old VLA datasets
initial version

Quicklook pipeline for HI observations with the WSRT.
initial version

Create CASA Viewer XML region files from an input tab-separated file
with position and velocity constraints. Used for creating Identikit
projections. Uses CASA toolkits.
initial version

Scan the list of images taken with LUCIFER to determine which dark
frames need to be taken to match the observations. Generates two
LUCIFER dark image scripts with the appropriate exposure settings.
Made default behavior of EligibleLoggers to search for data from past 3 hours, rather than over all time.
little improvement

Signed-off-by: Alexandre Perez <alexandre.perez92@gmail.com>
Merge branch 'master' of https://github.com/projetp1/Frontend into skymap
Merge branch 'diego' of https://github.com/projetp1/Frontend into skymap
Merge branch 'diego' of https://github.com/projetp1/Frontend into skymap
Merge branch 'settings' of https://github.com/projetp1/Frontend into skymap
Merge branch 'diego' of https://github.com/projetp1/Frontend into skymap
Merge branch 'diego' of https://github.com/projetp1/Frontend into skymap
Add new images for moon and sun

Signed-off-by: Alexandre Perez <alexandre.perez92@gmail.com>
Draw constellation, and increases number of image for moon, improve
skymap

Signed-off-by: Alexandre Perez <alexandre.perez92@gmail.com>
Merge branch 'diego' of https://github.com/projetp1/Frontend into skymap
moon's image resize

Signed-off-by: Alexandre Perez <alexandre.perez92@gmail.com>
little improvement

Signed-off-by: Alexandre Perez <alexandre.perez92@gmail.com>
redo the calculs for know the place where the PIC point

Signed-off-by: Alexandre Perez <alexandre.perez92@gmail.com>
Show the coordinates in DMS format
Bugfix: ASC is not a column name
Show the searched item in the autocompletion bar
function getConstellations done
Change database's tables
Merge branch 'master' of github.com:projetp1/Frontend into diego
Implemented first entity behavior for player; got a functional demo of movement together.
Fix signing up feature, take user to alternative confirmation page
Restrict reading tickets to correct project scope
Restricting creating tickets to only users who have permissions to do it
Added explicit interval length
add titledockwidget
Merge branch 'develop' of https://github.com/prymatex/prymatex into develop
bugfix issue reported by d3f0
30% more fast highlighter
Move some code
Merge branch 'develop' of https://github.com/prymatex/prymatex into develop
no message
Merge branch 'io_heka_tree' of https://github.com/psilentp/Analysis into io_heka_tree

Conflicts:
	.idea/workspace.xml
Fixed bug in which fieldPos of Builder dot stimulus component couldn't be changed each frame

fieldPos attribute of Builder dot stimulus component couldn't be
changed each frame. Due to differences between handling of this
attribute called fieldPos as opposed to simply pos in the patch
stimulus.
Also fixed some typos in a tool tip for the patch stimulus hints and in
one code comment.
Merge pull request #122 from m-macaskill/master

Fixed bug: fieldPos of Builder dot stim couldn't change per frame
cs fixes
removed defaults from route
removed redundant header call
added CSV support

- export to csv format with --format & --output
Merge pull request #1 from spatil/master

CSV support with 2 CLI options --output and --format
Remove asc file a source for RPM builds

We used to require the asc file for RPM builds of facter.  This was not
consistant with our packaging of any other platform and raised the
barrier to entry if you were trying to build your own facter package.

This commit removes the requirements of signing the tarball for building
an RPM package.  Tarball will still be signed prior to official release
from Rel-Eng team at Puppet Labs.
Spec file cleanup

This commit removes the Config, RbConfig switch which was needed for ruby 1.8.1
compatibility, as 1.8.5 is the minimum supported ruby. It also updates the
license to a valid correctly named license. It removes comments from some
%global macros as well. It also adds the epoch to the changelog entry.
Remove INSTALL from Facter

The INSTALL file dates back before there were packages besides gems for Facter.
As there are now packages for most major platforms, the INSTALL file isn't
needed. This removes it from the tree and from packaging.
Remove CHANGELOG from Facter

This commit removes the CHANGELOG file in the top level
of facter, which only contains commit hashes/ messages
from the previous releases, and is of debatable utility.
This information can be gleaned easily from a git log,
and is not of much use without git. Removing it removes
yet another manual process from the releasing of facter.

It also removes references of the CHANGELOG from the packaging.
Merge pull request #329 from haus/maint/1.6.x/facter_spec_cleanup

Maint/1.6.x/facter spec cleanup
(#15975) Extract HTTP methods from REST Indirector

There were some useful HTTP methods (http_get, http_post, ...,
http_request) in the Puppet::Indirector::REST class. Most noteworthy
is the http_request method, which provides some useful error
handling so that users get less confusing error messages when something
goes wrong with their certificates / SSL setup.

These methods would be useful in several other places (among them: the
HTTP reports processor and several places in the puppetdb termini), but
prior to this commit it was very difficult (or impossible) to use them
without doing a very confusing dance with unnecessary ruby mixins and
inheritance from classes in the Indirectory hierarchy.

This commit factors these methods out into the new
Puppet::Network::HTTP::Connection class, and tweaks
Puppet::Network::HttpPool to return instances of this new class.

It also refactors the HTTP report processor to use
Puppet::Network::HTTP::Connection.
Merge branch 'refactor/3.x/extract-http' into 3.x

* refactor/3.x/extract-http:
  (#15975) Extract HTTP methods from REST Indirector
(yardoc) Correct @since information in the Ruby DSL files.

The format should be @since major.minor comment.
This commit changes the @since tags to @since 3.1 EXPERIMENTAL
(maint) Return removed modules in a predictable order

Return modules removed by the uninstall action in a predictable order.
[Statistics][v2.2] Vocabulaire bisouland
add .classpath file。
Tweaks to destinationcodes
Use "DLR" not "Docklands Light Railway"
Use "DLR" not "Docklands Light Railway"
Add test for bad routing error
Exception handling when destination is specified
Add __repr__ for RailStation
Get agreeing number of parameters
Longer DLR linecode
Merge WMTube and WMDLR into WMRailTransport
Merge WMTube and WMDLR into WMRailTransport
Add filtering for Terminates Here and for trains with destinations specified
Updated destination codes
Switched to java.jdbc 0.2.1.
Remove unnecessary let. Follow KISS principle
Fix some paths in the startup code.
Remove diagnostics.
Guava toString, hashCode, and equals for domain objects. Removed unnecessary Objects.
Merge pull request #1093 from rackspace/rax-clb-refactor

Some refactoring for Rackspace CLB.
replaced jersey w/Uris & UriTemplates; removed complexity in url encoding and edge cases like matrix params
Merge pull request #1094 from jclouds/no-jersey

replaced jersey w/Uris & UriTemplates; removed complexity in url encoding
Add more logging to DeleteAllKeysInList

This allows monitoring of progress of long deletes via debug logs.
Merge pull request #1095 from andrewgaul/delete-all-keys-in-list-debug-logging

Add more logging to DeleteAllKeysInList
interface inherited from baseclass
removed custom code that duplicates functionality of guava fallbacks
Close Payload directly
Merge pull request #1099 from jclouds/guava-fallbacks

removed custom code that duplicates functionality of guava fallbacks
Merge pull request #1100 from andrewgaul/close-payload

Close Payload directly
remove dependency on bcpkix-jdk15on
Merge pull request #1102 from jclouds/no-bcpkix

remove dependency on bcpkix-jdk15on
Install the appropriate chef gem version
Merge pull request #1104 from nacx/chef-version

Force the version of the Chef gem
Merge pull request #1103 from DaanHoogland/master

new seperate pull request for inherited interface
Remove explicit dependency on bouncycastle for PEM parsing
Merge pull request #1105 from jclouds/no-bouncycastle

Remove explicit dependency on bouncycastle for PEM parsing
missing file from last commit
base pr for - jclouds provider for google compute engine
- addresses comments from #1010
- includes the following base apis
	- projects
	- operations
	- zones

These are 3 small apis that are required by other apis in some place or another.
Revert "Initial commit"

This reverts commit 3147b21f6e0b0ebe7dab48bc2e05490e7366421d.
fixtures: civ + types
Asset pipeline working?
Add test for v1 ARC file with a v2 header.
Handle bad urls with colons in them.
Add arc files needed for test_small_warcs.py
Using my own comparator in PointSET.java, due to Coursera bug.
Memoized KdNode rect generation.
undo-tree 0.3.4
CLC-529 introducing fakery via VCR
CLC-529 Make everything work properly when fake mode is off
CLC-529 Attempt to fix Travis's VCR failure-to-match error
CLC-529 Try to fix OpenSSL error on Travis
CLC-529 Automated way to freshen up the fake data feeds
NOJIRA - update the dependency list
Merge pull request #64 from ctweney/clc-529-vcr

CLC-529 Using VCR to create and serve fake http requests
Merge pull request #66 from christianv/updatedependencies

NOJIRA - update the dependency list
CLC-637 CLC-653 Use in-memory sqlite3 for fast-tests; don't load test data into Oracle
Also fixed name of User API integration test & bad LDAP_UID assumption.
Merge pull request #65 from raydavis/raywip

Add update_attributes to model (for practice, basically)
Merge pull request #67 from raydavis/sqlite

CLC-637 CLC-653 Use in-memory sqlite3 for fast-tests
[NOJIRA] Update Gemfile
Merge pull request #68 from yuhunglin/NOJIRA8

[NOJIRA] Update Gemfile
NOJIRA - update the gemfile.lock file
NOJIRA - Remove adding the `postgres` user

The `postgres` user should have been created by
default when you did the `initdb` command.

> In order to bootstrap the database system, a freshly initialized system always contains one predefined user. This user will have the fixed ID 1, and by default (unless altered when running initdb) it will have the same name as the operating system user that initialized the database cluster. Customarily, this user will be named postgres. In order to create more users you first have to connect as this initial user. [1]

[1] http://www.postgresql.org/docs/7.4/static/user-manag.html#DATABASE-USERS
Merge pull request #69 from christianv/updategemfile

NOJIRA - update the gemfile.lock file
CLC-656 - Add tests for user controller
https://jira.media.berkeley.edu/jira/browse/CLC-656
Merge pull request #70 from christianv/updatereadme

NOJIRA - Remove adding the `postgres` user in the SQL script
Merge pull request #71 from christianv/CLC-656

CLC-656 - Add tests for user controller
CLC-529 Cleaner way of getting freshen_vcr ENV variable to the app code
modeling invitations
Fix errors introduced when adding additional options to bcrypt adapter.
Remove test annotations which apparently broke Travis
Add a readme, like github says I should
Modified products/new view to call products/new/?asin=foo by AJAX.
Merge remote-tracking branch 'origin/master'
README tidying, version bump.
Removed hashfile.
fixed sending to sourceforge script
Tile Types, more Board logic
Add nice twitter button
change tab shortcuts to <leader> z (:tabp), x(tabn), c(tabnew)
Rewrite php-saml to use ZF naming conventions, PSR-0 structure, improve repo layout, add Metadata generation, improve tests
Rewrite php-saml to use ZF naming conventions, PSR-0 structure, improve repo layout, add Metadata generation, improve tests
Buttons and left layout are updated
Calculated variables can now be added to grid variables and do the calculation based on the row they are in
Missing .ld files
desktop launchers
Todas las variables globales usan la notación camelCase
add file 5 on dev
entity
add favicon
modified teachers
Merge branch 'master' of git://github.com/feola/kafgsk.ru into feola
DSP-1265: Removed unneeded import
File cleanup.`
Merge pull request #30 from rkrzewski/scala_2.10

merge of current master into scala_next
Changes to support OSGi with 2.10.0-RC1

This injects the OSGi bundle classpath into the compiler mirror that
is introduced in the latest Scala compiler, and is needed for the
compiler to find internal classes.

Only the production code in scalate-core and scalate-util have been
changed, the existing test failures still remain.
Merge pull request #31 from vivosys/scala_next

Changes to support OSGi with 2.10.0-RC1
Scala Tools is dead. Long live Sonatype.
Merge branch 'master' into scala_next
Enable commented LoopTest.

Crashes the 2.10.0-RC1 compiler, but fixed in snapshot.  Going to commit
compiler crash workarounds in a single, easily revertable commit.
Move addon filters into their own subpackages

Addon filters moved into their own subpackages. This keeps things clean
and prevents a "split package" situation with OSGi deployments.
Make scalate-archetypes-itests versions match.
Merge branch 'master' into scala_next
Revert "Enable commented LoopTest."

This reverts commit abe5cf19b4ad132c9e113c367a3d2b9bb81459e0.  Did not
mean to push this yet.  It still crashes on RC2.
Upgrade to scala-maven-plugin 3.1.0 for incremental compilation.
Merge branch 'master' into scala_next
Upgrade to Scala 2.10.0-RC2.
Use public versions of all plugins; now builds clean with -Pdownload.

scala-mojo-support and scalamd are temporarily fetched from org.scalatra,
pending pull requests being accepted upstream.  wikitext already has a
public snapshot.
Merge pull request #33 from vivosys/filter-subpackages

Move addon filters into their own subpackages
Merge remote-tracking branch 'origin/master' into scala_next
scalamd has been published upstream, roll back to it.
Don't depend on backout after fatal errors, it's a Scala bug.

MustacheParser breaks in Scala 2.10 after this fix:
https://github.com/scala/scala/commit/fa3c892017a95dfbb647b382e76f98a7952c6ff0

Because the error is now fatal, the mustache parser never backs out to
give the nested parser a chance to parse the end statement.  This
removes the fatal error from the grammar.
Append _2.9 tag to all artifact IDs to denote Scala binary compatibility.
Merge branch 'master' into scala_next; change _2.9 to _2.10.0-RC2
Mark hooks in the ChartGenerator
Generalized hook marking to allow hook type indicators
Modules collapse
Fixed bar chart to work with multiple views
AS7-4722: Add overlays before the webapp init
fix bug

too much get request cause error returning message. I've fixed it.Login
logic remain undo
Added insert_before().
Work in bitset_and_not().
Merge.
Modified Author
sealoff update
Check for trusted hosts when generating absolute URL
Adds l3_suite_interface, which replaces the old varargs l3_suite usage.
Start to doc modem class and put connectio method to private 
Add better comments
Add method delete to Modem class 
Merge branch 'master' of github.com:rodrigopinto/biju
Merge pull request #2 from roignac/master

Gwibber sharing
Fix stupid table layouts
Merge branch 'master' of https://github.com/stayradiated/LightRead
Fixes Feeds with no links
Moar settings.
Merge branch 'master' of https://github.com/stayradiated/LightRead
Remember last feed/filter
Update Changelog
Started on Dark Theme
del phaselistenerlogin from controller pack
more changes to table, restarting problem persists on linux
more spring cleaning, deleting old stuff
Delete theme default
finish demo app after bundle update
Longer refresh time for main feed
Merge branch 'master' of github.com:royk/new_modified
Work on welcome mail
removed pg for ec2
Mailer fixes
Installing and configuring Spork gem to speed up all tests;
Fix some comments.
lposix.c: make file & creation flags public; pass flags to open as an integer mask, not a table.
better README
Further updated README
Adds __FILE__ and __LINE__ for better backtraces in class_eval code
Corrects Changelog entry

[ci skip]
Advice added
Specs for rb_lastline_get
Add rb_lastline_get. #1747
Make sure we join the returned thread before continuing
Add specs to Range#max and Range#min

The one that fails under 1.9 mode is "(5..5).max.should equal(5)".
Fix Range#max behavior in 1.9 mode

This rolls back a change made in 04c2c40d. If a range is inclusive and
the start and end points are the same, Range#max should return the
endpoint, not nil.
Merge pull request #2109 from rf-/fix_range_max

Fix Range#max behavior in 1.9 mode with inclusive ranges
Update #sort_inplace comment. [ci skip]
Fix timing issue of Thread#kill and sleep

In some cases, a thread isn't correctly killed by Thread#kill. If that is the
case, Thread#join on that thread leads to the deadlock.

Consider the following example:

    thread = Thread.new do
      sleep
    end
    thread.kill # actually, don't kill
    thread.join # thread lives forever; deadlock

Thread#kill does 2 things to kill a thread:
    1. prepares the thread to be terminated and
    2. wakes up the thread.

Most of time, the wake-up is executed after the sleep in the killed thread.

However, it is possible the wake-up is executed BEFORE the sleep in some rare
cases. If that is the case, the wake-up does nothing because the thread is
still waking up at that time. Then, the thread begins to sleep forever. As a
result, Thread#join never returns.

To avoid such a deadlock, Thread#sleep must check to terminate or not before
actually sleeping. In addition, it must be asssured that the wake-up isn't
executed AFTER the check BEFORE the sleep.

The follwing diagrams illustrate the good and bad timings.

Good timings:

                 Time
                 ------------------------------------------------------>
    main thread  prepare - wakeup (no-op) |
    new thread                            | check - no sleep - terminate

                 Time
                 ------------------------------------------------------>
    main thread                | prepare - wake-up |
    new thread   check - sleep |                   | terminate

                 Time
                 ------------------------------------------------------>
    main thread        | prepare |       | wake-up |
    new thread   check |         | sleep |         | terminate

Bad timing:

                 Time
                 ------------------------------------------------------>
    main thread        | prepare - wake-up (no-op) |
    new thread   check |                           | sleep forever

To fix the deadlock, this commit makes check_async be called before sleeping
inside the park mutex.
Add a spec for dead lock by Thread#kill and sleep
Merge pull request #1884 from ryoqun/thread-join-deadlock

Fix Thread#join deadlock from use of Thread#kill and sleep
画像処理サンプルのプロジェクトファイルを追加
フィルターバーを表示/隠すアニメーションを追加
demonstrating that I am bad at git
- Refactoring the test API exceptions;
 - Creating a ParametricTestWrapper statement to keep test argument information on a test exception;
Cambio if-else por switch

Se ha cambiado la sentencia if-else por switch.
Add libm for functions such as `sqrt` on Ubuntu.
Minify CSS with YUICompressor
mark indirect dependencies in the dump
Merge branch 'master' of https://github.com/ryppl/ryppl-cmake
Added + populated dropdowns, options are ordered.
Added a link to my little pong game :)
Cleanup unused headers, code.
browse all adjusted to see parties2
Set the OpenCL variables in system.cmake to not show if there is an error
Fixed foreach callback
TESTS: remove compiler warnings
new benchmark,better approach
valikko. Pelistä takas valikkoon ESCillä. main.py pitäis putsaa
AluminumTester: producing min. solution coverage
Fixed missing radix in parseInt() call, and style issue resolved
Partial fix [#30744] BMesh: Particle system face/volume emission doesn't work if there is a constructive modifier earlier.

When ORIGSPACE is added, it is now a loop data, so we need to mark tessdata as dirty too. Also fixed DM_ensure_tessface to check DM_DIRTY_TESS_CDLAYERS flag!

This fixes problems with subsurf + dynapaint + particles, however, some modifiers, like remesh, seems to create a new dm from scratch, hence loosing completely those CD layers… Note this bug already existed in 2.62, so this is not a regression.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45319 954f8c5b-7b00-dc11-b283-0030488c597c
Reverting some style changes from r45305.

See discussion here:
http://lists.blender.org/pipermail/bf-committers/2012-April/036098.html

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45320 954f8c5b-7b00-dc11-b283-0030488c597c
Merge remote-tracking branch 'remotes/trunk'

* remotes/trunk:
  Reverting some style changes from r45305.
  Partial fix [#30744] BMesh: Particle system face/volume emission doesn't work if there is a constructive modifier earlier.
update addon_contrib scripts
svn update
Working(\!) ping/pong between two servents, with ping re-occurring properly
Completed the layout structure
Added the logo.png and custom stylesheet
Added partials for footer, header and stylesheets
Added layout links (with routes)
refactor logo to logo helper
Added a Users controller and layout links tests
Use byline instead of name
adding driver stack
small change to test merging
another small change by drivers to check merging
back to normal
changing names of stacks
Use hover arrow image
fix default -authors value (replace ~ with $HOME)
better help messages and error diagnostics
git rid of some unneeded imports of scalaz
Merge pull request #245 from stew/scalaz7

git rid of some unneeded imports of scalaz
Chat example for atmosphere works now
Re-enables ContentTypeTest
Apply retab!
* Added MeterWidget headers
Added CacheFactory interfaces and a few updates

Made the 'responseType' property in HttpConfig optional, and added a few
overloads to the jqLite interface.
added tree view for files
Merge branch 'master' of git://github.com/schmunk42/p3media
New Doctor URL's
hello uglytwt2!
production server with css
moved specs to buster
first preps for prefetching associated objects
limit + skip

Added filter limit + filter skip for query .all
Update lib/adapters/cradle.js

fixed an issue where if no filters were passed in, the .all query would throw an exception
using views speeds up the query by only fetching the documents for the model being queried.
cradle adapter update

using views speeds up the query by only fetching the documents for the model being queried.
Merge pull request #142 from sdrdis/master

Fixes on common_test
- fixed typo in updateOrCreate method.
- added views to do .all queries, it speeds up the query.
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/adapters/cradle.js
- added views to do .all queries, it speeds up the query.
- fixed typo in updateOrCreate method.
Fix id:null issue #98
0.1.27-1
fixed type check strictly
remove commentouted source
Merge pull request #146 from taiyoh/master

BridgeToRedis#forDb and BridgeToRedis#fromDb methods fixed
Merge pull request #144 from muneebs/master

update cradle.js
Cast id to string before creation, fix #145
Merge branch 'master' of github.com:1602/jugglingdb
update mongodb adapter
Merge pull request #150 from fshost/mongodb

update mongodb adapter
Better docs, no warning
added filter on schema though I am not sure it will be used
Updated the map, made a do-nothing __main__.py
fix rt for replies and parent tweet
Added alias for ll = "ls -ltrh"

From my blog post: http://sef.kloninger.com/2012/08/wip-folders-with-ls/
Merge branch 'master' of github.com:sefk/sef-dotfiles
Remove debug_blast_parser.py from PEP8 cleanups.

(Does this script work?)
First prototype of AstNode class.
Remove converting hash to objects

It fail on ruby 1.9.1 and rails 3.2 when call time.to_s(:db)
Support for tracking the top-used tags at any one time.
(high-level sketch for) processing an SCC

also, prepared to insert abstraction nodes in the
control-flow graph
Add graceful unicode decoding fall back to replace mode.
Fix final save of progress.
PacketSyncApplication minor changes
Merge branch 'master' of https://github.com/shahpoojan/NetSim
Add osse's idea about contains.
migrations and fixes for charting datetime
добавлены эффекты fadIn/fadeOut
реализован ререндеринг при ресайзе страницы
better init buffer size for reading a InputStream
修复plum提交post请求bug
实现php路由重写功能，支持tsdk
changes in ajax template render function
sourceコマンドは上手く実行されなかった
Update Gemfile
Merge pull request #1 from RobertoUa/patch-1

Update Gemfile
add jars to support facebook login
remove useless files
add jars
todo: js validate
fb plugin
Try to make it look nice
ddl e dql alterado nome
Ajout d'icones et reorganistation du dossier.
Adaptation du chemin vers les icones.
Ajout de la methode contents() de Webos.File, pour recuperer le contenu
d'un fichier ou dossier.
Resolution de bugs sur NautilusFileSelectorWindow.
Ajout de l'icone d'un paquet.
Resolution d'un bug : nombre negatif de requetes en cours de chargement.
Modification de la commande quickly-cli : ajout d'options.
Ajout du logiciel quickly.
Added view package :)
実行メソッド作ってみた
JSPファイルをGitに追加しない
adds Carl Sverre to contributer list
Remove set binary noeol
Update for async chat stupidity
add lambda-mode.el
add magit
Merge branch 'master' of selnpcgwnx1001:.etc/dot-emacs
Add memo/D_development_env
Update plugin/fcitx.vim

disable fcitx when it is not running
total re-merge
10-19 notes
Bugfix, missing namespace.
Clean and organize each layer.xml
Change panel spacing and loading
Merge layer.xmls with Autopsy master
Add check for correct file paths in Hash XML
Change spacing and comments
Change exporting reports to copy the source
Fix JavaHelp HTML and CSS
Merge https://github.com/sleuthkit/autopsy
add a util method to copy files
Keyword search API change to AbstractFileStringContentStream.
Javadoc update.
remove regex/str match cache (it made more difference with synthetic benchmarks than real-world apps)
cleanup
Merge pull request #17 from wesleyhales/master

cleanup to init another travisci build
Suite construction structure et habillage
matching jira version name exactly
Fixed error in loading multiple shapefiles example (#SUITE-1157)
renamed datastore for loading multiple shapefiles example
Fixes to User Guide Filter function reference
Merge remote-tracking branch 'origin/pr/30'
Cumulative fix for

GEOS-5293 CAS proxy tickets must not be used as key for the authentication cache
GEOS-5294 Valid CAS service tickets must result in an HTTP session creation
Queue that reads from a file passed as a command line arg
Adding software carpentry directory
Merge branch 'master' of github.com:smoitra87/scratch
Fixed jobs

Added usermessage to send job data to client and net messages for client
to request server to change its job. Added a 10 second delay on runing
commands in the params.startcmds table.
link style and stream highlight style
Merge branch 'master' of git://github.com/sneakyness/AppApp into stream_design_pt2
Merge pull request #53 from sixbit/stream_design_pt2

Stream design second pass
Retract facts
Finished implementation of fact retraction

- Refactored facts and tuples to maintain linked lists of child tuples
- Reworked logic for retraction
NOTE: Some unoptimalities exist with how join conditions select facts
from tuples
Improved tuple handling and fixed retract bug
Added fact update functionality
Rebased and added tests

- Rebased off of the latest develop head
- Added tests and fixed a bunch of merge conflicts
- Applied code cleanup
Reverted back to old querystring parsing
Significant restructuring to make the architecture clearer
Added image link
Fixed image and contribution message
Removed editor cruft from .gitignore
Added larger architecture picture
Tidied up the explanations
Finalised the new README
Clarified IGNORE_PATH relates to the CloudFront collector
Add a replay button on requests in the Search page
add slide to carousel
displays a list of selection populations..
REALSIL-AF75F,ds_jin,d:/master/script,12/03/14-18/03/02
made only certain things bold
Add standard deviation function, revert to pattern matching (again)

Pattern matching has enables better code reuse within the project,
which with pattern guards was not possible. Code is also shorter.
The downside is that no error messages can be reported, however
this is a minor drawback.
Add combined probability function
newBibTexObjectPanel refactor
more ref
more ref2
Merge branch 'develop' of github.com:solxiom/ohtu_mini into develop
more ref3
no https for eventray
rename project to lines
clone and checkout support
bump package version to v0.1.2
(explanation: the value returned is a qVariant not a bool and so needs explicit comparison to work)
Revert "got rid of boolean value comparison using == as stated in pep8 style guide"

This reverts commit 3bd77170380152fadc3132ad2695d2fa6d43a6ce.
Added explanation to line returning qVariant for future eyes.
Provided the ability to set mocha options via JS

- Extract mocha setup options to Konacha.mochaOptions
- Adding a simple test for Konacha.mochaOptions
- :disappointed: You can't introspect mocha to find out which
  options have been set.  This leads to a bit of a dirty mirror test.
- :shipit:
added som submit debug
readme typo, change installer away from symlinks
broader preferences store, not just vim
Include 'bin' directory with tmux-login script
Added bin/tmuxed and some zsh configuration.
add apache log file rotation
Simplify apache vhost conffiguration
Better imdb search.
movie catalogue: add save button.
catalogue: Add delete function.
Catalogue: List countries with flags.
movie-company should not be a subclass of person.
Add support for Atmel AT26DF041.

Wicked chip: No WRSR, no write enable command (but swallows our
default one without a problem), supports an auto-erasing page write
(but even without that page writes are recommended to write the
whole page i.e. operate on a completely erased page), mad
requirements on block refreshments if only partly written.

Found on my Intel D946GZIS and tested with my serprog in situ.
Using the page write by setting JEDEC_BYTE_PROGRAM to 0x11 and using
the spi_chip_write_256 command greatly improves performance and works
flawlessly.

Signed-off-by: Stefan Tauner <stefan.tauner@student.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@student.tuwien.ac.at>

git-svn-id: svn://coreboot.org/flashrom/trunk@1616 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
update scan tests
version 1.1 test processed
Merge branch 'master' of github.com:stocyr/LaserChess
bootstrap: use SYSROOT for native headers. 2.6.39 headers
Added verbose option to production, too.
Using instance variables instead of passing around locals.
Broke push-failed error message into multiple lines.
Added instance variables for from_branch_name and to_branch_name.
Refactored tagging. Added a block to #abandon_ship.
adding textmate project files to ignore
adding .env to ignore
first test passes!
wrap hudson descriptions
color disabled builds
fix filtering query
allow only one large pane at a time
Changed Person.fromId to constructor, commented out disfunctional code in Mail.To, fixed Mail.To returning attachement instead of recipient
Fixed Mail.To not returning all recipients
first commit
Merge branch 'master' of github.com:superbug/superbug
Added modal for ppt/music sheet upload
Add news to front page
Initial commit to callmeback.
ActiveSupport and developement dependencies added.
Library implemented.
Specs implemented.
Include ActiveSupport::Callbacks methods directly in the module.
README written.
terminierung
Merge branch 'master' of ssh://git@github.com/sushi1986/bti5-vs.git
Issue #1 completed
Merge remote-tracking branch 'origin/master'
Modification du README
ZP-258 #comment fixed $messageid variable name in log message #time 15m

git-svn-id: http://svn.berlios.de/svnroot/repos/z-push/trunk@1502 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5
Fixed #17938 -- Made explicit object ordering in LiveServerDatabase test assertion. Thanks Nate Bragg for the patch.


git-svn-id: https://code.djangoproject.com/svn/django/trunk@17869 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Refresh list of known issues

git-svn-id: https://svn.forgerock.org/openam@3973 0f4defcf-c51a-4c67-9f44-6fb5eba73c5d
Refactor the intermediate code processing to split CODETREE into various modules.

git-svn-id: https://polyml.svn.sourceforge.net/svnroot/polyml/trunk@1611 57040599-48ee-4647-8227-d26cbd406fcb
Fixed vmessage format: %d vs %ld


git-svn-id: https://staden.svn.sourceforge.net/svnroot/staden@3076 ba6f2710-ca9f-427c-89d3-5bf716dbc8e1
Remove minor compilation warning.


git-svn-id: https://staden.svn.sourceforge.net/svnroot/staden@3077 ba6f2710-ca9f-427c-89d3-5bf716dbc8e1
Fix A* bug
edit reduc code
Update documentation for Database.

Issues:
* Addresses #1 on GitHub.
Update documentation for Date.

Issues:
* Addresses #1 on GitHub.
Update documentation for Inflection.

Issues:
* Closes #1 on GitHub.
[Validator] Fixed group sequence support in the XML and YAML drivers
[Validator] Fixed: StaticMethodLoader does not try to invoke methods of interfaces anymore
merged 2.0
added baseline message classes for the intial preview
jeesus kristus pelasta
SERVER-6930 append correct format for timestamp
SERVER-7220 fix Linux compile
added CV_OUT to StereoVar output paramiter
Issue #2541 make install does not work for Android build fixed.
Issue #2537 OpenCV Manager doesn't work on Android 4.2 fixed.
Merge pull request #157 from vpisarev/bug_fixes5
Merge pull request #159 from asmorkalov/libinfo_install_fix
Merge pull request #160 from asmorkalov/android_4_2_manager_fix
Update URL for TBB download. Update to TBB 4.1 update 1
Issue #2548 Missing static library libtbb.a for armeabi and mips build fixed.
Test execution inside Eclipse fixed;
OpenCV testing via OpenCV Manager implemented.
Update Android CMake toolchain for NDK r8c
Fix Android build with clang compiler
'Merging pull request 163 from asmorkalov/opencv'
Merging pull request #162 from taka-no-me/opencv
Merging pull request #167 from asmorkalov:java_api_manager_test
Merging pull request #169 from taka-no-me:android-ndk-r8c
Update the introduction to the MOD base on Sanguosha

Signed-off-by: Takashiro <takashiro@qq.com>
Fixing relative imports in test files. These are mostly imports of pytest, but I fixed a couple others I noticed.
Fixed instances of 'from pytest import something'. For the most part this meant doing 'from ...tests.helper import pytest' and then changing 'something' to 'pytest.something'.
Fixed a hanging 'misc' left in after merging test_pickle_helpers.py.
And fix importing test.helper from the wrong level after move of test_pickle_helpers.py.
Merge pull request #457 from jiffyclub/fix-pytest-imports

Correct pytest imports from "import pytest" to "from ...tests.helper import pytest"
Added module-level docstring for io.hdf5
Renamed sp to spectral and sd to spectral_density
Fixed remaining sp and sd instances
Add a sentence to docs/io/misc.rst to clarify
Merge pull request #479 from astrofrog/fix-hdf5-docs

Clarify io.hdf5 docs
Merge pull request #412 from astrofrog/fix-equivalency-names

Change 'sp' in units to 'spectral'
Remove NumpyOutputter and support masked table in io.ascii

Conflicts:

	astropy/io/ascii/core.py
Remove Keyword class; change Daophot to put keys into meta

Conflicts:

	astropy/io/ascii/core.py
Remove table as attribute of io.ascii Reader object

Conflicts:

	astropy/io/ascii/core.py
Refactor pprint._pformat_col into an iterator + post_processor

Split _pformat_col into an iterator section that iterates over
the string-formatted column values instead of collecting them
into a list.  The post-processing part then does stuff that is
needed for pretty-printing.

The driver for this was to use the iterator (and all the nice
formatting machinery) to do the string formatting in io.ascii.write.

Conflicts:

	astropy/table/pprint.py
Add Column method iter_str_vals to iterate over string-formatted values
Update io.ascii.write to use Table columns and Column.iter_str_vals method
Remove io.ascii Column iterator and formatter refs

Conflicts:

	astropy/io/ascii/core.py
PEP8 fixes

Conflicts:

	astropy/io/ascii/core.py
Continued transition of io.ascii to Table - tests pass
ok, now it's fixed for older releases
Merge branch 'fix/illegalutf' into develop
remove export_all flag
aggiunto foglio JAVA
Add importer
Add importer
add ignore
Delete .bundle
日付が全て同じになっていたのを修正。dayOfMonthがlistのそれぞれの値に同じDailyStateオブジェクトの参照を持っていました。ループ中に新しくオブジェクトを生成する事で回避
macが閉店する〜。仮コミット
とりあえず日時データを入力・表示される所まで実装。DB登録および月次画面への反映は行っていない
Merge pull request #3 from tanopaul/flada-auxv

というか私も権限もらって、操作できたのでしたw
diff見る限りでは問題無さそうなので取り込んじゃいます。
modification de l'affichage des popups
Add raid controller utility / nagios check setup for PERC H200 and LSI 9260 cards
Refactory export
Merge branch 'master' of github.com:tassotirap/grview

Conflicts:
	src/org/grview/syntax/analyzer/gsll1/Analyzer.java
first commit
Merge branch 'master' of https://github.com/taureliloome/tron
Added server.c and client.c
changes in katello-tests.xml
profile only once
added sendJson to controller
added ISUPPORT
removed old dev file
channel parsing lookup using chantypes from ISUPPORT
fixed tests
removed obsolete example
updated gemspec files
simplified callbacks, removed filters
really removed filters
removed unnessecary argument
thaum instead of ponder
moved default callbacks into a private method
Remove useless enum.
Client gauge tweaked again
Actually check we are in the correct world because WorldGuard doesn't.
Merge branch 'develop' into api/saveAchievement
MODE-1412: Added security domain for modeshape
Trying to find the bug with the test
[email] Add snazzy new icons for the bottom toolbar
Merge pull request #4236 from mozsquib/master

[email] Add snazzy new icons for the bottom toolbar, r=asuth
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
App titles are not updated when the locale is changed
Merge pull request #4679 from crdlc/bug-4645

[Homescreen] Bug fixed app titles were not updated when the locale is changed
collection of more dimmer WiFi icons
Merge pull request #4688 from pivanov/master

collection of more dimmer WiFi icons
Bug 801980 : When loading is failed, exceptional handler of Mediadb should get called to continue iterating in metadata parser.
Merge pull request #6348 from rexboy7/fix-bug801980

Bug 801980 : When loading is failed, exceptional handler of Mediadb shou...
bug fixed wrong condition in opacity
Merge pull request #3466 from crdlc/feature-bookmarks

[Homescreen] Bug fixed wrong condition in opacity
Fix bad use of conf.get_boolean('basic', 'legacy')
Add rectemp folder in repository
Add a test to check temp recordings are saved after a crash
Add save_crash_recordings in repository init (Issue #12)
[code refactor]
[dist] tests
[+] grunt node build
Update SSL check to work with proxies.
Updates tokenizer to correctly parse `/*comment*/i`
Merge pull request #14 from sasmith/master

Updates tokenizer to correctly parse `/*comment*/index`
add db table request
optimize backend
Prepping dev env
working on the list
Merge branch 'master' of https://github.com/the-hobbes/HackVT

Conflicts:
	index.php
Finished lists
added fetch code
more readme updates.

Signed-off-by: Chris Churchwell <chrisrulesall@gmail.com>
Extract function for retrieving data

Data can be retrieved from a buffer or an encoded string

Refactoring only
i can haz serverz
asdf
Fixed extrudePath for shape
Updated trackball control
Install Homebrew before RVM
Fix permissions
Install GCC 4.2
Updating things for travis-ci
change to IVFS
adde method to destroy an app
Merge branch 'master' of github.com:timeredbull/tsuru
change to be compatible with latest logback jar
Implemented bug-fixes for dependency connections - logger warning when not recognised dependency to external library or language library
add TNavMaker for module admin
chmod
dependency installation
reorganization, extreme wip
header writing is generic now, adjusts to the given metrics
fixed file writing paths, added analysis methods
extracted a constant
some renaming
implemented a new analysis, that analyzes the results of the metrics analysis
code formatted and init eclipse project
finish the styling - it looks GOOD
fix indent
tests for llqueue
remove using statements
middle layer and backlayer with prepared statements left of lab1
Fixes issue #376.
Made a few minor changes to this post.
TokenMapGenerator and tests.
scala list answers
added get satisfaction and TODO list
Fixed #1, 'manage.py runserver doesn't work on Windows'.
added blurb about Windows support to readme.
add basic generator functionality to build contexts from html pages
Test commit console
Just clean project
Change something for example gradient image, NMI
Outro 細かい修正
Accordin = accordion, fixed image
moved variable to top-level scope. otherwise bad(TM) things may happen
adjusted include file names, if'd debug code
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
issue #205: changed CentOS version
addition of mult_featured_images plugin
async: don't fail on EINTR or EAGAIN
modify to display overlay on intro page items
commit changes when cloned to mac
update project name
every fragment of a msg vector keeps track of the first/last fragment, number of fragments and fragment owner
Mozilla does not do string substitution for empty DTD entities, so FillEmptyCompiler is needed for use
Mozilla does not do string substitution, so FillEmptyCompiler is needed. Also MarkedSourceCompilerFactory comments out all the lines with # -- totally not expected behavior
get comment parsing for .properties back into PropertiesHandler
test de fonctions
Added multi-level bullet-pointing; fixed bug in navigation box leveling.
Show twitter stream
Float images left inside of posts
Blog post for the first meet up