labofsahil/github-event-dataset-2012 huggingface dataset:
Updating mux and adding slice primitives
Fixing issues with counter & mux wrappers
Fixing counter toVerilog call
Added the bit_shift and updated the slice blocks
attempting to test the simulation of the mux block
Setting up the ROACH2 base & wrapping with python
adding the ibufg and ibufgds wrappers
adding the wbs_arbiter to the base deign for R2
adding some primitives to the primitive libray.

These commits are a still work in progress.
Updating mux and the bram modules

The mux module now has a parameter for different data widths
And implemented a dual-port bram with different port widths,
although this needs lots more testing.
updating bram primitive, adding software reg
adding epb_wb bridge, wb arbiter and epb infr
cleaning up the controller library
Adding swreg, updating brams, counter, delay

Created software reg with a wishbone interface.
Updated BRAMs
Corrected the syntax of the counter and counter_tb
Updating to be compliant with coding standards

Adding file headers and comments
Updating to comply with Verilog 2001 standards
A whole lot of small changes
Adding the wrapper xilinx IO primitives

This is just a subset of the Xilinx IO primitives and if anymore are
needed they can easily be wrapped in python.
Updating the used defined verilog code

The way which MyHDL provided Verilog and VHDL hooks into the python
code changed from version 0.6 to 0.7. I have modified all exisitng
modules to use the new method. for more info on the reasons for the
change see the MyHDL whats new 0.7 section 6.
Changing the sw_reg_r wrapper to a class
adding the reset block to the roach2 base project

Added the verilog reset block and its python wrapper to the roach2
base project.
Renamed wires from dcm to mmcm in the infrastructure and clock gen
blocks.
Trying to get support for collections of complex types working
updating code to match latest ms release (and usage of oss libs)
signature to allow functions to be captured from the external programming model
Remove chaphead hack
Completely remove chaphead hack
overlay kinda working with nodes
added sebastian's name and link to the manifest
Test all the Rubies
Issue #480: Fix the build so that we bundle the typechecker, module resolver and antlr with the ant tasks
Issue #480: Fix the integration tests so they work with the ant jar build by the 'dist' target
Issue #480: Implement modification time checks for <ceylonc> and <ceylond>
Fix for #513: Review all @Ignored tests

Added issue numbers for those that had a matching one
Removed tests for old switch/case syntax with constants
Enabled some tests that now pass
Updated milestones for some tests
Tests for #595: Calling Java methods with varargs
ngResource: fixed indentation and moved method definition

Moved Resource.bind out of the actions forEach
Cleanup and test routine removal
datatable ui picker
trips search v3
fix package name, copy and paste error...
fix typo
Reworked tests to use a data provider
test
Merge branch 'master' of github.com:chenyongsuda/CareerCup

Conflicts:
	123.txt
i know its past time but i want this to work even if its just for me
added icons to git repo
Records data points only once now and saves them to a list
Better performance because data points are only added once

An estimated circle is now drawn on the screen (kind of accurate, but not always)
run second search ajaxily when no results are found from remote pod.
partial rename no longer needed
fixing conflicts in merge
fixing conflicts in merge
add spec to ake sure background query is only set when a full diaspora id is given.
jasmine spec for stimulating deferred searches
jasmine spec up and working. code out of (no longer called) contacts info page object. Fixed namespaces and created jasmine fixture for empty and pending searches.
simplify search results processing since only one person can be returned
added localized text in getting started view
Merge pull request #2984 from diasp/localized-text

Added localized text in getting started view [ci skip]
Merge pull request #2983 from diasp/improve-mobile-views

Improve mobile sign up and sign in view [ci skip]
added localized text in comment view
Merge pull request #2985 from diasp/more-localization

Added localized text in comment view
removed unnecessary js/css, since it works differently now
Merge pull request #2976 from jbivins/legacy-browser-support

Legacy browser support
Merge pull request #2978 from Raven24/video-thumbnail

oembed video thumb [oh yeah]
adding custom landing page for heroku
update some gems, including bundler :)
Revert "adding custom landing page for heroku"

This reverts commit 061badf74eb210fff4d46a99e9cbd0655cfd9637.
roll back heroku san
Improving print-data and Xid.toString to better locate prepared transactions on print-data log
Speeding up RA tests
Resource adapter changes
AS7-4548/HORNETQ-913 fix and test
https://issues.jboss.org/browse/JBPAPP-8769 - fixing large message contentions on bridge and redistribution
updated examples to allow setting of udp address via system property
Merge pull request #307 from andytaylor/master

updated examples to allow setting of udp address via system property
HORNETQ-316 -- Pluggable Broadcasting/Discovery Support

    The work is a major refactor of the original work taken by Tomohisa.

    Changes:

    1. Define a BroadcastEndpoint interface for broadcasting/receiving opaque data.
    2. The broadcast endpoint can be configurable for the server to use a different broadcasting/discovery technique than default UDP.
    3. Internally refactor the default broadcasting/discovery groups to use UDPBroadcastEndpoint.
    4. Add an jms example 'clustered-jgroups' to demonstrate clustering with a JGroups as the broadcasting/discovery mechanism.
    5. Add corresponding properties to HornetQResourceAdapter (ra.xml) to allow MDB's working with it.
    6. Add a test in FileConfigurationParserTest.
    7. Documentation in User's manual.
reverting compiler plugin as it breaks mac compilation
fixing
Merge branch 'master' of github.com:clickbeetle/cb_overlay
Merge branch 'master' of github.com:clickbeetle/cb_overlay
fixing
Update notes for submitted changes

* bump version to 0.0.5
opened docusign signing to everyone
On My Own Dime / Own Time

I made jQuery and Bootstrap play nice like I had hoped to utilize this
morning, on my own time.  The idea was scrapped at 5pm, but I was
curious since I was so close to being done. It works!
Added some docs.
Added some notes about the Python code.
refactoring generator function
Attempting to load extension as a sidebar element.
working on subscription billing. hitting mass-assignment problem.
Initial Commit
committing final project
Merge branch 'master' of https://github.com/colombo77c/CIS195-HTTP
last
Cloneable valueholder
Merge branch 'master' of https://github.com/colonelsammy/goospimpl
IS: actually create the attributeValues array
Making Why Did the Can Collapse public
Revert "Demo invisible square obstacle at (8, 8) to (9, 9)"

This reverts commit 52cbfa2bed24ed7a42ee11d09886bc736708d18a.
Add remove function to arrays module
Add early support of removing atoms

[#38274433]

It should work when there are no radial bonds or angular bonds.
Can be tested using console:
model.removeAtom(i);

Work in progress.
Add tests focused on adding and removing atoms

[#38274433]
Refactor interactive components creation

[#41475361]
Add the option to stash when calling git sync.
- Add the option to not fetch in git rstatus.
- Disable the pager in git rstatus, as it pages over each part intead of the entire thing.
Removed hard coded copyright.
Epic win. @link SomeName @/link will now link to a header page if no other match exists.
MB-5967: Fixup paths in cbepctl tool

Like the other Python/bash based tools, it has a hardcoded
/opt/couchbase path that needs to be made relative.

Change-Id: I5117fab4e216cb1f07079fb3577c12bbaa281191
Reviewed-on: http://review.couchbase.org/18764
Reviewed-by: Farshid Ghods <farshid@couchbase.com>
Tested-by: Jens Alfke <jens@couchbase.com>
Fix windows datatypes

Change-Id: I75aad0bb042d84fcf64c01f4d473bda6ac73cbee
Reviewed-on: http://review.couchbase.org/21352
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Smooth progressbar increment
Drag to zoom, just for Endre
Removed unused file heap.h/heap.cpp
Add pointer to web page and delete redundant info.
Remove vendored taggable on.
removing comskip stuff
Updated README.md

- updated README installation section
- added PDF files of the modules API to docs
refs #173 Zoom should now work on Firefox. Cause was Firefox using different names for the event, as well as the event object having different fields.
Merge branch 'master' of github.com:cytoscape/cytoscape.js
- fix 19/20 muster warning.
- the one last warning is disconnect duplicate user from server - i don't know how to compare two client.
Update to get it working!
paypal complete?
Still dealing with minor img bug
Responsive for large screen.
除外リストがIteratorで気持ち悪い件
Merge remote-tracking branch 'tomoyoshi/master' into pr1
add get value from path
removing deleted files... quite a buildup
Beginning front end work
todos: completed the placeholder for source in expression form
expressions: added fields 'source_type' and 'source_info' to expression forms with specs & integration tests
added permalink into projects and moved curated_pages to /pages/name
Merge branch 'develop' of github.com:danielweinmann/catarse into develop
npm installation working
add guidstr() function
print GPT partition type GUIDs
cast glEditor.size() to int for comparisons, as per http://www.patriciogonzalezvivo.com/blog/?p=585#comment-1382
Added if-modified-since code

Still needs alertdialog
Alertdialog now showing if no connection and no cached file

Initialized the AsyncHttpClient in the constructor of DataCache, since
onDestroy calls cancel on DataCache, which shutdowns the
AsyncHttpClient. If it hasn't been initialized a null pointer occurs.
Removed syso
Fixed to actually set headers
Merge pull request #43 from dansondergaard/feature-use-http-if-modified-since-header

Feature use http if modified since header
Added tools
Updated helpers
Stop using xelatex, since Latin Modern looks awful in xpdf
Report results of svn-multi experiments
Remove non-ASCII symbols from documents for better xelatex/pdflatex compat


git-svn-id: svn://dlink/build@158 7c4214cd-b045-46d4-a95a-930570af3fd6
Cranked up rerunfilecheck (does not work in xelatex)
Rerun latex based on rerunfilecheck as well
Run bibtex & makeindex for PDF output; needs more work for l2h HTML


git-svn-id: svn://dlink/build@159 7c4214cd-b045-46d4-a95a-930570af3fd6
Updated to latest svn checkin
Added missing src/ in pub implimentation files example.
Update to remove lib from import directive

lib directory is implicit for packages even when importing from src/
Merge pull request #6 from butlermatt/master

add missing src/ directory to implementation files example
Keep track of how many times each package and version is downloaded.
Code review changes.
Merge pull request #38 from dart-lang/download-count

Keep track of how many times each package and version is downloaded.
Backup on time: 1353843759
allows flask extension imports to work post flask 0.8 properly by switching to flask.ext instead of flaskext for imports
Fixing recover node removal
参考URLを追記
findElement updated
integration mode validation off (for realzies)
Closes #22 Add service locator helper method
github restructuredtext doesn't like me
Copy & pasted build status should point to the build for this project.
Better handling of ramdisk during make

make clobber used to call rm -rf out/
so if out is a soft link to i.e. /tmp/out
the soft link is deleted instead the content
so i changed the makefile to rm -rf out/*

Change-Id: Id1991161617da8ec34307a30412c134e31f589b4
build: Realign product libraries with corresponding applications

VideoEditor requires a build to call the full_base, but the libraries
are called in generic_no_telephony. This patch places the library
packages in the same product specification as the application using
them.
Use less heap space for dex on 32-bit build hosts

Run dex with -JXmx1024M instead of 2048M if running on a 32-bit host.
Surprisingly this appears to also work for framework and services; if
not, a little fine-tuning will be needed.

This does not change anything for non-32-bit hosts.

Change-Id: I1d87c3e394acc934af6f7770ea54ba265a1df838
Add standard method for enabling mfpu and mcpu code optimization
Fix SmokeTest

Change-Id: Ia53766b62d3777de49eaaac122042b99e6f1a3f7
Droiddoc: Allocate more RAM

increase -J-Xmx1024m to -J-Xmx2048m

Increases build time by a couple minutes

Signed-off-by: BMc08GT <bmc08gt.teamb00sted@gmail.com>
ProgressBar not supported on Octave
adding a change to html3
this is an extension of previous test
Enabled picture uploads for administrators
- center images
- write PIPE project page
- added pipe link
- updated pipe project page
updated images resources
Continued work on the calendar view
Merge branch 'calendar' of github.com:derekcannon/Whiteboard into calendar
redirect on search
Cache container
Detach container during menu toggles, giant perf improvement in short circuiting transitions
Better scaling styles for menu on browsers that support transforms
Code cleanup
Fixes #41: Implement Nicolas Gallagher's fix for transformed elements with pseudo shadows
Store assigned ids and compare to ids on init to determine need for reassignment, fixes #44
Adjust menu margins
Add beforeInit event
Make deck.change preventable, closes #48
Refactor base styles to apply to slides insted of container
changed status to position fixed to handle vertical scrollbar on slides.
moved fixed status position to only be when deck container is entire body of the document.
Merge pull request #49 from awirick/master

Position fixed on status
Update README.md
Don't completely screw extensions when deck.change is prevented
Put checks in on init to deal with empty decks, fixes #51
Fix broken menu events that came with replaceWith
Apply css transformations to hgroup elements.

Allow users to write 'sub headings' (useful on title slides). <h1>
transformations are reset and <hgroup> is shifted instead to the
vertical center of the slide.

Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com>
Update jQuery to 1.7 + adjust for deprecations
Comment rewording
Adding feedback, modal, and tooltip
modified:   TheChallenge/Domain/Domain.csproj
	modified:   TheChallenge/Test/DebuggerShim.cs
	modified:   TheChallenge/Test/Test.csproj
	modified:   TheChallenge/Test/packages.config
	modified:   TheChallenge/TheChallenge.sln
	modified:   TheChallenge/TheChallenge.suo
	modified:   TheChallenge/TheChallenge/Controllers/ContestController.cs
	modified:   TheChallenge/TheChallenge/Controllers/ExerciseController.cs
	modified:   TheChallenge/TheChallenge/Controllers/FoodController.cs
	modified:   TheChallenge/TheChallenge/Controllers/GoalController.cs
	modified:   TheChallenge/TheChallenge/Controllers/HomeController.cs
	modified:   TheChallenge/TheChallenge/Controllers/ProfileController.cs
	deleted:    TheChallenge/TheChallenge/Controllers/ValuesController.cs
	modified:   TheChallenge/TheChallenge/Controllers/WorkoutController.cs
	modified:   TheChallenge/TheChallenge/Global.asax.cs
	modified:   TheChallenge/TheChallenge/Helpers/WebApiInstaller.cs
	modified:   TheChallenge/TheChallenge/TheChallenge.csproj
	modified:   TheChallenge/TheChallenge/Views/Home/Index.cshtml
	modified:   TheChallenge/TheChallenge/bin/Domain.dll
	modified:   TheChallenge/TheChallenge/bin/Domain.pdb
	modified:   TheChallenge/TheChallenge/bin/TheChallenge.dll
	modified:   TheChallenge/TheChallenge/bin/TheChallenge.pdb
	modified:   TheChallenge/TheChallenge/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	modified:   TheChallenge/TheChallenge/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	modified:   TheChallenge/TheChallenge/obj/Debug/ResolveAssemblyReference.cache
	modified:   TheChallenge/TheChallenge/obj/Debug/TheChallenge.dll
	modified:   TheChallenge/TheChallenge/obj/Debug/TheChallenge.pdb
	modified:   nutritional_database/NUT_DATA.txt
	TheChallenge/Domain/Entities/User.cs
	TheChallenge/Domain/Repository/IUserRepository.cs
	TheChallenge/Domain/Repository/UserRepository.cs
	TheChallenge/Test/AccountTest.cs
	TheChallenge/Test/CryptoTest.cs
	TheChallenge/TheChallenge/Controllers/AccountController.cs
	TheChallenge/TheChallenge/Controllers/SignInController.cs
	TheChallenge/TheChallenge/Helpers/CustomAuthorizeAttribute.cs
	TheChallenge/TheChallenge/Helpers/Encryption/
	TheChallenge/TheChallenge/Models/LoginViewModel.cs
	TheChallenge/TheChallenge/Models/RegisterViewModel.cs
Rule 1 fix: Pushed more background images togther, then stitched them in using the new sprite.
Merge branch 'master' of https://github.com/discom4rt/webperf-site
Additional BLOG link.
complete test suite passing.
Merge branch 'simple' of github.com:documentcloud/backbone into simple
fixing swallowed merge link
add single-page service compatibility
Optimizated feedback box body size again
Added .gitconfig default file and copying it to home
Change the stupid computer bidding to take the bid at 125, not 140
Added auto focus on main page element
Added production settings
Start gitlab service.
moving the requirements to the thirdparty dir
mezclando el commit perdido
Merge commit 'b9f84b9'
es file
Merge branch 'master' of github.com:dospuntocero/Slideshow
Changelog: Bug fixed #72
README: Recommend using Git and the new install.sh
Update dependencies: factory_girl, capybara and nokogiri
Update to Rails 3.2.2
Moving Pike to Pile
Renaming the files within pile
Merge branch 'master' into gh-pages
Moving web files for Pile
Fixing up verbage for Pike->Pile conversion
Create scratchpad.txt
Add the port arg to check_http_url_regex. Default 80.
Merge pull request #4 from efroese/http-check

Add the port arg to check_http_url_regex. Default 80.
added barrel connector and touched up top silk
Reworked puppet manifest
Removed formidable direct use in file upload, causes conflict with parseBody()
Merge pull request #10 from dvyjones/move-jasmine-here

Move jasmine tests to travis-assets.
Add test running documentation
Remove the exclamation points from the URLs

For the rationale behind this, see travis-ci/travis-ci#437.
Recompile assets
Changed file names for ease of use

Changed file names for ease of use
Site updated at 2012-09-07 14:30:25 UTC
Fullmoon: fix titles font setting translation
small adjustment

[ci skip]
Update pyboleto_sample.py

Esse arquivo estava sendo ignorado pelo git. Acho que perdi varios
commits nele
fixed variable name typo in client authentication failure handler
Minor changes (simplifications) to Tuning.xsd
Generated the binding framework from Tuning.xsd
Created XML examples for the Tuning elements
Moved the entire note binding framework and examples to the note.bind
package
aggiunte stampe personalizzate
try to fix performace issue (automated release)
Translations

Signed-off-by: ekkes-corner <ekke@ekkes-corner.org>
remove console.log oops
Changed sock.send to sock.sendall in win32_run_poll
Default timezone should be the same as the host OS
Don't cascade delete forks.

Fixes #16
Merge pull request #24 from elementalvoid/protect-forks

Don't cascade delete forks.
Merge pull request #23 from elementalvoid/all-pastes-fix

'All Pastes' now actually shows all pastes.
Merge pull request #19 from jtimberman/master

Default time zone should be same as the host OS
Allow the use of local_settings.py for overrides
Paginação de Projetos.
App.
Merge branch 'master' of git://github.com/elenildo-joao/darthscm
Refactoring login and signup layouts
fixed ending youWin() screen.
changed pk path to BoilerPlate
use unittest2.skipIf for python 2.6 compatibility
collission gemaakt voor de explorer dat die niet door blokjes kan lopen hebben we de explorer class gemaakt
Copy editing on the 'about' aside.
removed the onscreen keyboard and replaced it with unicode event codes, added functions and UI elements for wifi functions, changed a bunch of buttons and keystrokes to accomodate the Z2 better. Added an icon for wifi signal strength to the btm bar.  Added a UI for changing USB mode from host to device.  Changed main loop to reduce cpu load.
created dataObj() output method
commit with valid AppID
* Fixed Image Dimensions problem. Now the Image dimesions are calculated using curl/imagecreatefromstring(); | previously hardcoded 200|200 :P

* Fixed public Url in readme.md
Merge branch 'working'
Fixed it so that players waiting in a game are not just invulnerable, but also cannot damage others. Also other tweaks and bug fixes.
Creating an infrastructure with LXC virtualisation : first step for continuous deployment.
don't symbolize the null id
zomg nerdtree
working out the quirks
more games list changes
more games list changes
Remove premature memoization
devilry_subjectadmin...managestudents: Fully working add examiner on single.
devenv.settings: Bugfix.
devilry_subjectadmin...AdminsBox: Loading message.
changed constructor and accessors
changed constructor and accessors
changed all Database.cs that require venue
Merge branch 'master' of github.com:expectomas/EventSparkz
Original Venue file
nun gesichert
-Add wrapping option for HTML (TODO: move parameters to CSS)
Return unidentified version as undefined
attendees pager fixed
latest: track the actual python file, not the symlink
update to linux-3.6.9-1
1. add images fetching from webpages
2. fix bug in removing duplication of links
3. fix bug in storage file format

Signed-off-by: fangnster <fangnster@gmail.com>
Re-added executing web services guide
Removing default grunt tasks which we don't use
Merge pull request #14 from ff0000/feature/grunt-rewrite-delete-tasks

Removing default grunt tasks which we don't use
abandoning project.
serialize/deserialize fix. now db obj has classes array
another set of possible compile fixes
Room management beta 1
program criteria
removed: legacy poc daemon.
fixed: typo on default port for echidnad.
fixed: set correct uri for barnyard2 event submission.
ajout ues + modif prog
Minor cleanup to support serialize/deserialize on private and protected fields.
Added ability to dump/filter permissions.  Changed snapshot defaults to make them HUGE.
Fixed a bug pasting schematics.  It seems to work now.  Changed snapshot to save into a folder called "jails"
Creato il service per Progetto.
Modificato il modo per raggiungere le pagine (meno controller, più fw)
Added teachers ability to fill the scores =)
cd to the right directory.
first working version
working version
working version
working version
Commit of the start union project

Try of commit
Drop in targets
blocking for reals
Specifying language for Travis [ci skip]
Console Debug 追加
1) Added "test" to packages script section
Merge branch 'master' of https://github.com/freethenation/funcflow
Electric Fence fixups
add a paragraph
mv pictures to link
2012.11.05 0630
Test against latest apollo versions.
reverted odd auto-injection of code into pom files
Bridge main added
These files contain url(s) and the correct fingerprints of the url(s). This files were used to test the request_certificate function.
GlobalSynchronizer enables multiple lexical forms with the same text
GitWrapper -> Config command
ConfigUtils support parameters.
TenantRepository refactor.
User and origin repository configurable path.
FIX: git repositories est path
Initialize search specifications on tenants ontology and search_strategy
Gem file mix support for ruby and jruby
Concept and patterns migration source
Import concept global metadata
Refactor GlobalSynchronizer
Patterns sheet import with metadata
Adjust patterns table row size
Popover for pattern expressions in list
fix a syntax error
build the Accounts controller to (later) serve the backbone app
Added Low Side Driver - (LSD) Code
Fixed wp-config problem. Thanks, Ewan!

Also: got rid of the ^M nastiness. Not sure how that snuck in.
Merge branch 'master' of github.com:garthk/puppet-wp-micro
Getting ready to get sockets working
jdfkjsdfckj
Hello Webonise!!
MongoDB 2.0.7 with package holding support
Added the introduction to the Application Listener

I only added the introduction of what is expected of the Application Listener
and the skeleton of our Shmup class.  This way, I can finally test the Ant
build script and iron out errors that I am unaware as of now that could hinder
my “progress”, if you can call that, later when building more “complex” code.
The short name of the game is “shmupyou”, not “shmup”.

“shmup” is too generic to identify later (Hahaha!) shoot’em project that might
come.  “shmupyou” is, in this respect, better.

I had to change not only the directories, but the package names and the
noweb documents and the bibliography file.  Actually, these two last I didn’t
need to change, but they look better, in my opinion, if they match.

--HG--
rename : latex/shmup.bib => latex/shmupyou.bib
rename : noweb/shmup.nw => noweb/shmupyou.nw
Oppsie, forgot to add the deploy script
fixed bug with scrollbar and dialogs
Deprecate captureExeptions in favor of context
Update runtests to fully reflect py.test behavior
hiding yes and no per default. Might fix that Facebook shows both
Update documentation to mention `#within` instead of `#with_transaction`
rzym.txt
Merge pull request #24 from jedzio/branch_wiersze

[Juliusz Słowacki][Rzym]
release version 0.1.8
fix resolv matching
Update README.md

More general statement following renaming the repo from dotvim to dotfiles.
temporary fix to a template issue related to twisted (twisted templating library itself does not permit dynamic content)
sys-apps/portage: Implement preliminary removal support in cygdll-update

o also removes some cruft from cygdll-update
o added a bunch of todo items, mostly fairly important ones

In testing this I've started to see cases where cygdll-update
fails with rebase errors before it completes.  I'm tempted to
dump cygdll-update and reimplement as a C program -- but OTOH
if I could fast-forward to where we have access to mingw, then I
might be even more tempted to reimplement cygdll-update as a native
windows executable!  This way we could concentrate all kinds of fancy
logic into it including shutting down cygwin and rebasing if need be.

For now, it stands, maybe I'll try to rejigger the scan to do all
its subshell stuff before it starts doing the actual merging --
but probably can't solve the fundamental problem that it uses
"mv" to move the files.  Even if we used:

  x="$(cat foo)"
  echo "${x}" > bar

we'd still have the old foo lying around and then the issues with
permissions and so-forth get really hairy.... meh.

Worst case scenario right now is: cygdll-update goes haywire
midstream; user must kill all cygwin processes and rebase;
lather-rinse-repeat several times.  But at the end of that
everything should work, and cygdll-protect is /mostly/ doing
its job right now (but see TODO for caveats).
doc: minor addition in REPORTING-BUGS

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
Fix followers controller
Use mailboxer >= 0.6.5
Fixes in event calendar
Post to public by default in follow relation_model
Update followers controller to new ViSH view
Merge branch 'master' of github.com:ging/social_stream into vish
Move most methods from SocialStream::Models::Object to ActivityObject
Merge origin/master into vish
Fix profile toolbar contacts
0.24.1
Merge branch 'staging' of github.com:ging/social_stream
Rails magic fixes return to path after log in for some controllers
Fix comments watermark and comment link after new timeline entry
Fix indentation
Avoid overwriting after_sign_in_path_for but use Devise's stored_location_for
follow event animations
Refine subtype error handling
Object channels to actions
Add mailboxer migrations to social_stream:migrations:update
Flatten migrations before 0.20.0
try to fix build arch
Missile firing is actually working!
Added drag on projectiles, and fiddled with some constants
Merge remote-tracking branch 'origin/master'
Added Cas A plot of transit through S-engine beams
Updated jquery and included packages in README
Add Gemfile for bundler.
Move all presettings to config/application.
Remove unneeded requires (all requires now featured by bundler and Gemfile).
Updating of dynamil libraries added
Imported XML::XParent::Schema::DBI module
The same log entry is written twice when HA_LOGFILE=HA_DEBUGLOG
updated with callcredit uat environment tests
putting sinatra/activrecord back
Updated to released aether-deploy
unifying logging for configuration; fixing strategy + statistics
moving rewarding logic from results object to analyzer; results class soon to be obsolete
Perform an Xcode LastUpgradeCheck bump.
Merge branch 'gh-pages' of github.com:heroes/world-of-heroes into gh-pages

Conflicts:
	development/js/states.js
[XML validation] wrote test, works

Signed-off-by: Jan Keromnes <janx@linux.com>
small fixes
Merge branch 'hotfix/1.0.1' into develop
new save and overwrite
Add: send method to Comet Client
minor configuration change
new makefile reference
new message print
Mapreduce improvements, and a better implementation of count().
Fixed the arg order for assert_equal.
Fix multi-line file reference
同步文档 API 到 OORedis 1.9.1 版本
去掉《快速入门》小节中 redis 的 ip 地址
Layout review and parametrized detailed view
first commit
Version 1.0

Works only on Firefox atm.
Merge pull request #36 from benlings/gh-pages

Use union merge driver for index.html
That was a bit too dark.
Fixed highlighting of 'Home'.
Implement Web Audio API - Pt. 1
[CodeIssues] Fixed an issue with try/catch statement in redundant
assignment issue.
Tests demonstrating that the accessors for a property that implements an interface property do not have any ImplementedInterfaceMembers.
(Rather ugly) fix ensure that accessor method are reported as implementing the corresponding accessor methods from interfaces.
Tests for ImplementedInterfaceMembers for indexer accessors.
(Rather ugly) fix for indexer accessor's ImplementedInterfaceMembers.
Failing test with explicit indexer implementation
Fixed InheritanceHelper to support explicit interface implementation of base accessors.
Added support for explicit method and property implementations to the cecil loader.
Fixed bugs with events: 1) Assignment of IsOverride to IsOverridable, and 2) AccessorOwner not being set for auto-events.
Support explicitly implemented events in the CecilLoader.
Another one of those x.IsOverride = y.IsOverridable issues.
Don't report a member as implementing an interface member if there is another explicit implementation of that interface member.
Merge pull request #65 from erik-kallen/ImplementedInterfaceMembersForPropertyAccessors
Add IType.GetAccessors().
Accessors now use EntityType.Accessor instead of EntityType.Method.
Added accessors support to DefaultMemberReference and ExplicitInterfaceImplementationMemberReference.
Removed hacky code from CecilLoader - we now allow IsExplicitInterfaceImplementation=true on accessors.
Comentarios
Merge branch 'master' of github.com:ikesada/smartsolutions.git
Aggiunta Accordion su pagina INFO
Update, as planned. Sun, 06 May 2012 21:39:01 +0400
Update, as planned. Mon, 30 Apr 2012 11:04:01 +0400
Update, as planned. Tue, 22 May 2012 14:27:02 +0400
Update, as planned. Sat, 12 May 2012 12:06:01 +0400
Update, as planned. Fri, 20 Jul 2012 14:07:01 +0400
[fix] Re-add Dean and update schedule.
changed maintainer
release 0.4.1
remove collision avoidance from cob_linear_nav, now handled by cob_collision_velocity_filter
change parameters
tidy up
change default parameter
tidy up and rearrange
fix include mistakes
rename cob_linear_nav to cob_navigation_linear, rearrange again
add missed file
fix wrong inclusions
Merge branch 'master' of github.com:ipa320/cob_navigation
fix dependencies and launch files
Merge branch 'merge320'
remove internal dependency
Merge branch 'master' of https://github.com/ipa-frm/cob_navigation into review_flomirrus
rearrange stack
fix roslaunch checks
modifications for raw3-1
modifications for raw3-1
Uses require all for chemistry-temperature
Allow "-" at the start of CSS identifiers
Allow nested functions in CSS, like linear-gradient( ... color-stop() ...)
abolish toggling more about me part
photography heading
fix with loop then load to postgres for merge
Presentation activity updated with Brahim changes.
Deleted previous presentation files.
Little changes in ChooosAnimalsJungleActivity (order of animals).
New images in presentation activity, with "3D" effect.
pycharm
Merge branch 'development' of https://github.com/j-walker23/MyTruckLane into development
Twitters RSS-feed stopped working
Some updates
Added support for VGTV
Small Tv4 issue fixed
Site updated at 2012-08-16 10:01:14 UTC
Site updated at 2012-08-16 06:30:35 UTC
Added color, width, dashed to the grid. Added dashed lines
initial implementation of now playing pager
Add map to buses#index route'
Fix for ExecuteAsync
WinRT
Adds a nova::db recipe to be run_list'd on the database server

Break out the database creation from nova-setup.rb and put into
a separate recipe that can be run on a database server that does
not have Nova installed on it.
revised asset1 mosaic
Added style none to list.
SWITCHYARD-929 - Added inbound operation dropdown for inbound JCA bindings
move distraction free writing to gvimrc, remove escape for CmdT for now, it breaks arrow keys
Windows extension (so that they cover the totality of the edges)
Neg and Postive Votes
Switched to appropriate less file; moved stuff around
Added a handler for numbers (not yet used).
Merge branch 'content-editable' of https://github.com/jceipek/Scrubbing-Calc into content-editable
More notes! About things!
Fix caption string
New function to extract the crc checksum from a gzip file

* this is much faster than calculating md5 hash for large files
Make ParseSWCTree return an object with class neuron

* also return null on failure rather than -1
New RerootNeuron function + test for GraphTheory

* RerootNeuron only handles SWC data chunk at the moment
  (ie does not handle SegList)
Add new SWC2Neuron (which actually makes a neuron) and ParseSWC (core parsing)

* tests for these already exist in GraphTheory
* had demonstrated that SWC2Neuron is equivalent to ParseSWCTree
Deprecate ParseSWCTree
Replace calls to deprecated ParseSWCTree with SWC2Neuron
Recalculate SWC data from SegList

* but this can fail unless SegList and SWC points are in the same order
remove redefinition of intersect function

* this has been r base for a while now
Fix refactoring of ParseSWC now that input is called swc (not MySWCTree)
Fixes to RerootNeuron (also recalculates core Neuron fields inc SegList)

* also fix for specification of root node
* and make sure parents are integers
* a couple more tests (1 of which still fails)
Add write.neuron and write.neuronlist functions

* write.neuron will write dotprops objects as 'rds' files
Handling of rds files for saving/loading dotprops objects

* also oxygen docs for write.neuronlist
Fix errors with transformedPoints/TransformNeuron when warp file is missing
Fix very slow subsets of neuronlists

* this was stupidly implemented and resulted in the original list 
  being duplicated.
* There are several places in my code where some gymnastics was required
  to get around the speed penalty imposed by this bug
Added special case for open/close bracket symbol being identical, and a flag --latex for the obvious
Search metrics files from workspace instead from module root
[maven-release-plugin] prepare release dtkit-1.8
adding permissions to user model
Testing and updates for 710 - Fix CSV linking.
add ui changes foruser permissions
Merge branch 'master' of git://github.com/jorgej/RapidFTR into 710-Fix-fix-CSV-Linking
text fixes. i am unsure why i had to make the edits for the edit user details items, the custom field item, or in paths, but that's what i had to do to allow myself to see the other ones in the bulk run of cucumber.
child retrieved by creator
merge from master
Fix defect #548: password_confirmation field not highlighted when it is blank
[vinkesh, suhas]: #1115 | Rendering suspect and reunification status in pdf and csv exports
Bug #762: Logout link on top now pops up confirmation while on edit child page
Story #639 (code clean-up): Updated the User class's localize_date method to take an optional format for the returned date-time string.
Story #639 (code clean-up): Removed date-time parsing from the child history view.
refactored user views into partials

users list is now using disabled checkbox, instead of 'disabled/enabled'

added manage user javascript and jasmine spec
added users_details and change_disabled_status_url

added view spec for userdisabled checkbox

passing jasmine javascript tests for manage_users

clicking the disabled checkbox now dispatches ajax put call to update user

added expectation in manage user jasmine test for authenticity token

Pairing with Weiwei: bind checkbox 'change' event instead of 'click' event to trigger changing the disabled status

Pairing with Weiwei: added confirmation dialog before actually changing disabled status of user

added jasmine spec for cancelling update of user disabled status

added cukes for disabling user from the manageuser page

Admin that canceled disabling / enabling user should have the checkbox reset to previous state
Fixed user story #799
Jaco/Meredith: Spelling mistake in _notifications and beginning of Cuke test in features
Jaco/Meredith: Story #1111 request date format for non existing users complete
Jaco/Meredith: Story #1111 date format notification COMPLETE
Jaco/Meredith: Story #756 complete - removed last known location and date of separation from summary view
Merge branch 'master' of https://github.com/runemadsen/RapidFTR into 799-displaying-suspect-items
Refactor Innodb::Page to support non-index pages
add incremental value
more work on global detector
made globalal detector works in node + cleanup
cleanup + better example in node.js
added tests for privateforjs - fix #50
แก้บัคเพิ่มข้อมูลไม่ได้
ทำปุ่มบันทึก และ Create
เก็บรายละเอียดความถูกต้อง
ลบ Routing, function ที่ไม่ได้ใช้
Code Facility list
Merge remote-tracking branch 'origin/master'
Check target.
Check is phony.
Don't die if an undefined item is found.
Don't die; print all errors.
Don't sort.
Don't try to be clever here when sorting.
Dump unused cruft.
Stylesheets are package-visible.
added direct renderer
Remove JSONP and use requestbuilder with CORS instead
ReferencedBy annotation was changed for FindBy annotation
Component Annotation added
AbstractComponentMock moved to API
Support for initialising components before tests executions added
calendar refactored - all Date methods were removed
getAllCells added
AbstractComponentMock deleted since moved to API
refacoted to use FindBy annotation
popup component refactored
dependencies declared in the parent pom.xml
tidy the code, so can upload photo now
statusline encoding
added js and css assets to precompile list
Fixed working with real parameters
new instagram feed page
Fixed some stuff and changed some other that came up while importing PR data.

added PR locale
 added PR launch date
 added trim so import of long bill names dont break the DB
added null check on openstates_url.nil

commented some rake task for data that is not supported for puerto rico
yet.
Added a en-PR local file
Updated stylesheets to include PR political part
idk
openstates dosnt support download of bills only api access
bin/start.sh fix 2/2
UPDATE ADMINISTRADOR DE ARCHIVOS

VISTA TABLA USUARIOS.
SE AGREGO ADMINISTRADOR DE ARCHIVOS  - GALERIA ELFINDER.
Whoa! Big changes.
rättat format på screenshot/notification.png
Moves authenticate into SessionsHelper
New implementation almost ready
going with one src, for the future
Removing references to JController Parameter

A JController object is no longer passed to the JViewBase constructor in the code. Just updating the docs to reflect that.
Removing references to JController Parameter
Merge pull request #1493 from dongilbert/patch-3

Removing doc references to JController in JViewBase and JViewHtml
Remove the curl.h Include (it broke the buildbot)
xx
Moving to module_formatter (which is part of Ansible now)
Added usage helper copy  to logger file
fixed typo with -v
documentation updated for ncdr2ImportCSV1D
Site updated at 2012-09-01 11:52:43 UTC
initial changes for descrbe the scene
added support for describe the scene and improved response to svs queries
bug fix: sanitised the session recording playback sequence.
added error handling, gist selection, logout
links separated out into an includes, render plugin from http://www.testically.org/2012/02/03/a-concise-way-to-render-a-markdown-partial-in-jekyll/, some css work
Site updated at 2012-07-23 15:53:48 UTC
changed table completely to Tweet and will try to get postgre to work on Heroku
sin ckeditor
-DMZ_NO_JIT_SSE deleted.
Merge changes into standalone leaderboard.
Fixing quotes
Updating bootstrap-related foo
Fixing Sidebar and adding some missing icons to navigations
Fixing board new post indicator
Updating to newest server version
updated Mayaseed to version 0.1.7.
Quickfix: replace slideAndRemove() with remove() to prevent the ugly javascript error and make the post go away after click on "hide". Fixes #3249
Escape hashtags in emails

Custom Redcarpet renderer to escape hashtags (but not legitimate headers)
in emails before Markdown processing. Prevents hashtags from being rendered
as H1 headers. This also leaves open the possibility of parsing hashtags
into clickable links in the future.

fixes #3325
load small-res images initially in small frames and load full res asynchronously to cut down on inital network time.  this should make masonry do its thing faster. [ci skip]
Revert "load small-res images initially in small frames and load full res asynchronously to cut down on inital network time.  this should make masonry do its thing faster. [ci skip]"

we don't process images with the same aspect ratio at smaller
resolutions.

This reverts commit 6d038d6225f236fc4edd4ca56353a3a079cdea2b.
Merge pull request #3332 from stevenh512/refactor-emails

Escape hashtags in emails
Merge remote branch 'upstream/master'
Merge branch 'master' into justinthomas.name
Stylesheet naming issue (new-templates.css)

Replace all references to new_templates.css with the correct filename,
new-templates.css
Mobile UI fixes

This fixes issues with mobile UI rendering

Issues fixed:
* vendor/bootstrap.css and vendor/bootstrap-responsive.css need to
  be precompiled for the mobile UI to render properly
* Rails 3.1 is more strict about layout fallbacks, the single-post
  view in the mobile UI needs to have the "application" layout
  specified to render properly
Merge remote branch 'upstream/master'
Merge branch 'master' into serendipitous
adding 'debugger' gem to Gemfile

It fixes a lot of the issues ruby-debug19 has.
Merge branch 'master' into debugger

Conflicts:
	Gemfile.lock
cleaning up in the debugger corner
Merge pull request #3227 from tsujigiri/debugger

adding 'debugger' gem to Gemfile [ci skip]
Actually only load rails admin in production mode

This is what I think 28f8db51e79 was supposed to do.

With the initializer in an "unless Rails.env.production?" block
the entire initializer was being ignored in production mode and
loaded in all other environments, but Rails Admin was still
loading regardless of that. :grin:

This only loads rails admin in production and excludes it from
all other environments. Also keeps non-admins out of /admin_panel
(without the initializer it was free-for-all) and temp fixes #3210
until a new gem is released.
hopefully fix another weirdly fluctuating test failure
don't test for opacity but for the selector
use post cuke step instead of old skool steps
delegate frame_name in reshares
create a new publisher using the new composer. only for beta users
see, if this fixes those nasty cuke timeouts
Merge remote branch 'upstream/master'
Merge branch 'master' into justinthomas.name
Corrected friction coefficient from 0 (frictionless) to 0.5 (roughly steel on concrete)
Fixed #1 Refactor the font atlas.
Fixed #2 Migrate tests to the UnitTest++ library.
Merge branch 'master' of https://github.com/k-stachowiak/env-flyer

Conflicts:
	test/gl_complex/cam_ui_test.h
	test/gl_complex/geom_factory_test.h
	test/res/img_bmp_test.h
	test/test.cpp
	test/test.h
plus.gif now centerd in edit and new foodstuff
Zwei copy-paste Fehler bei Spielfeld.countSterneSpalte und Spielfeld.countPfeileSpalte entdeckt und korrigiert.
asd
asd
Merge branch 'master' of github.com:kangasbros/electrumpos
Added some style effects
facet query manipulation
RSA REST deprecated..
PRO plugin added..
Interface stage 2..
RegRat: Bug Fix..
Error call added..
Pro call fixed..
Next call extended..
PRO plugin optimized..
Interface stage 3..
Interface stage 4..
Interface stage 5..
Interface stage 6..
Interface stage 7..
Added NSFileManager+UserDirectories
Added UIViewController+SubtitleView
Also added directory paths
Added NSArray+Occurrences
Subtitle is optional, use CGRectIntegral
XXX: recreate titleView
Merge branch 'master' of /Users/rox/Projects/github/keeshux/ios-components
Updated README with new components
Added UIColor+Darkening
Category demo and FIXMEs
Move to base
update yard documentation for User model
commit Homework 0
fixed a building error
rough stuff going in
Bugfix for liquid weights.
Container volumes and liquid charges tweaked for self-consistency.

Plus a bugfix for pouring liquids back into the same container.

Conflicts:

	README.md
	itypedef.cpp
Added concrete walls, made them spawn in underground labs. Changed underground floors to rock.
Cleared out underfloor from game.cpp, corrected the order of wreckage and twisted metal
and changed the rubble clearing query to use your zlevel rather than terrain.
Labs should have correctly spawning concrete walls and floors
Fixed the bashing of metal stuff
Made 36in string and 6-30ft roop craftable.
Sewing kits reloadable with thread, thread can be crafted or
found in all the same places as sewing kits.
Fixed rotten cooked food issue.. maybe
Bugfix in food crafting involving non-liquid charges.
Readded fuzzy stacking for cooked meat
Merge branch 'master' of git://github.com/TheDarklingWolf/CataclysmMod into for-darklingwolf
Fixed sewing kit reloading
Casings are no longer obscenely flammable
Add option to change skill rust behaviour

Conflicts:

	README.md
	player.cpp
Options for skill rust
Option to autodrop empty containers

Conflicts:

	README.md
Option to autodrop empty containers
40mm Casings, currently unused
Revert "Stack shell casngs where appropriate as they are generated."

This reverts commit 9a4c553e1ac250805bab977f73a67760b459d27a.

The method chosen of incrementing the charges member of the shell casing items doesn't work as expected.
Factored jacob.css into results.css - CSS for notices (particular and general) and anchor tags.
Fix some build issues and upgrade to LTE for base.

This fixes some issues with repositories no longer existing.

* replace glassfish maven reporsitory with jenkins maven repository
* Update the Jacoco version to most recent released version.
* Set parent version to 1.424.6 instead of 1.400
Fix failing unit tests.

This fixes several failing unit tests.  Many are expecting different package
names, and locations for files.   In addition, the tests have been upgraded
to use Junit 4 style notation.
* Documentation update.
Main is now Gruntfile.js
Rename GenerateIndeces to GenerateIndices
message proxy library has been published
jksakjs
Fixed the default tracking action when a redirect url is not provided to kontagent_redirect.php
tidy lqfb editing
fix suggestion, supporter, vote tables
Adding basic validations for the login model
Adding a simple test for the login model
Fixing a small typo
Updating the schema with the new login migraiotn
fix front page create bill button to be aligned with the text form
Update twitter bootstraop
Add the ability to add items to the edit bill form dynamically
change adminuser password resetflow
DnD v1

Drag and drop is fully functional with a few performance tweaks required.

Signed-off-by: Ken Stowell <ken@cdbaby.com>
epicModal Drag n' Drop.

Signed-off-by: Ken Stowell <ken@cdbaby.com>
serialization of simpleBirdsController, slight improvement to restart/load handling
Site updated at 2012-06-06 23:06:39 UTC
Added simple infinite loop for testing.
Added the -signal feature for specifying a custom UNIX sigal.
Defaults to 9 (SIGKILL).
work on checking out a movie
Movie Controller calls repo to create movie
Move list templates back to engine
Merge pull request #14 from WizardOfOgz/master

Templates into engine
Allows for date params to be submitted as a hash.
Ploneboard PO updated.
moving RR implementation to the Abstract root class