labofsahil/github-event-dataset-2012 huggingface dataset:
logic update 2
JPA ist auf dem Weg irgendwann mal zu funktionieren
Merge remote-tracking branch 'Sascha/slaveNo2' into sascha_merge

Conflicts:
	src/gmb/model/financial/ExternalTransaction.java
	src/gmb/model/financial/InternalTransaction.java
	src/gmb/model/financial/LotteryBankAccount.java
	src/gmb/model/financial/ReceiptsDistribution.java
	src/gmb/model/financial/Transaction.java
	src/gmb/model/financial/Winnings.java
	src/gmb/model/request/GroupAdminRightsTransfereOffering.java
	src/gmb/model/request/GroupInvitation.java
	src/gmb/model/request/GroupMembershipApplication.java
	src/gmb/model/request/GroupRequest.java
	src/gmb/model/request/MemberDataUpdateRequest.java
	src/gmb/model/request/RealAccountDataUpdateRequest.java
	src/gmb/model/request/Request.java
	src/gmb/model/tip/DailyLottoSTT.java
	src/gmb/model/tip/DailyLottoTip.java
	src/gmb/model/tip/FootballGameResult.java
	src/gmb/model/tip/PartialResult.java
	src/gmb/model/tip/SingleTip.java
	src/gmb/model/tip/TipTicket.java
	src/gmb/model/tip/TotoSTT.java
	src/gmb/model/tip/TotoTip.java
	src/gmb/model/tip/WeeklyLottoPTT.java
	src/gmb/model/tip/WeeklyLottoSTT.java
	src/gmb/model/user/Adress.java
	src/gmb/model/user/Customer.java
	src/gmb/model/user/GroupManagement.java
	src/gmb/model/user/Member.java
	src/gmb/model/user/MemberData.java
	src/gmb/model/user/MemberManagement.java

	ALSO: changed LinkedList to List
Merge pull request #2 from Bummel/master

da isser
【追加】タイマー０で停止
Modified RuntimeException message in NotEqualBinaryConstraint#fromString.
Finished test for NotEqualBinaryConstraint.
First attempt at merge with S
Converted entire project to run in C++.
include d2k mod in official packages
added HarvesterAttackNotifier.cs to .csproj

Conflicts:
	mods/d2k/rules/system.yaml
getting the bootstrap js to work with boilerplate admin
Implement creation of more entity types.
Right click action
Add request filter for api version and add dynamic version

More to do, this is preliminary
Merge branch 'vcloud-director-5.1' of https://github.com/cinderella/jclouds into vcloud-director-5.1

Conflicts:
	labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/login/SessionAsyncApi.java
Fixed a markdown syntax problem in the README.
setup maven artifact, working on login
More work on login, very naive implementation done
added files
renaming packages
Work on login, welcome page, user mgmt
no comment
only running for as long as needed
cleaning up
working on photo add
Refactored map query into a controller and added caching of maps based on input params.
working on takenby mappings
self promo
b64 images dont work with the minifier :-(
a quick-ass fix to blocks-theme, fix later
Login page with CSS;
Merge remote-tracking branch 'origin/master' into WebCode
Link not underlined anymore
- Added hot attribute to CallableValue::call()
Fixed float and minified
update readme, slight cleanup
Add toString method for substitutions.
IWalkTerm implementations that loop or map should copy metadata.
update new link to latest snapshot on opensmtpd.org
Update notes for submitted changes

* Add tool to convert json formatted logs into more human-friendly format
Better error message for API task commands.
first crack at nightly build system.
created git repo
Merge branch 'master' of https://github.com/cmkm/jquery_thumbs
first commit
Merge branch 'master' of https://github.com/cnirkhe/STLtoGCODE
Import 2.6.0 tarball.
GUI of the field and animation
Merge pull request #1 from didikong/master
remove comments and old code for clarity
frabjous day! requiring coffeescript auto registers extension for requires
Reset migrations.
sgf for patterns
gridboard update and sgf non-conflinct version
[ISSUE #34] escaped '\'s in jade, removed some of the pipes
moved public -> browser, deploys to public
moved server stuff to server, fixed typos in browser
merged with coolaj86
update the file suffix
update the module installation
new module to hold all db interaction
changes to virtualenv
put user back in class to initalize new instance of it
changes to a bunch of stuff
Remove unneeded line
Add vim .swp files to .gitignore
Fix indentation, clean up code
Misc cleanup
More misc cleanup
Also gzip javascript.
Test split with vbuckets in reverse ordering.

This should theoretically exercise the VBSplitRangeParts.Swap()
function for a little more code coverage.
Readded patch to allow for use of custom teleporter for transfering dimensions.
Cleanup repo, delete old code
Update FML to 278, MC 1.3.2
Cleaned up forge scripts, and updated AT config for 1.3.2, deleted any reference to server specific code.
Updated patches to 1.3.2
Fixed bug in DimensionManager that would cause Index error for custom dimensions, also made WorldProviders aware of what dimension they are.
Updated FML, should fix the new included eclipse workspace.
Updated Orientation with new helper functionality.
Fix ItemBlock placement, should fix RP Deployers placing blocks 1 tile down.
Seperated block placmenet logic in ItemBlock as immibis requested: https://github.com/MinecraftForge/MinecraftForge/pull/110
New Command event.
Fix issue with default getContainerItemStack
Add render distance property to TileEntity.
Update FML again for mod screen blending fix.
Rename Orientation to ForgeDirection {Damn MCP naming a class Direction already}
Fix potential index exception in ForgeDirection
Whops
Improved resource matching and HTTP response codes.
Cleanup action response handling.
Fix chisel.app.serve
Some reorganizing in _js. Changes to grunt.js
increased admin functionality
Tweak the tab style to look better
picture manager uses an ID, not a picture object
EditPicture xml
Merge branch 'master' of github.com:cs301w01/Meat-Loaf
work AST semantic
modifyTbl_toTest
Provide DnD target feedback.
Dynamically position DnD target marker.

Its position and size will now always match the textarea exactly, even
if the textarea is resized between drag sessions.
Report errors properly.
Finish chapter 8: Exception.
Signed-off-by: ChunTian Liu <lcntn3@gmail.com>
upgrade jquery 1.8.3

+ accordion buttons now toggle between < and > on hide/show
Added dialog to add valid genes to UCSC gtfs. Also made further edits to menu options.
now really fixed status colors
Commiting for merging
Merge branch 'master' of https://github.com/cwrc/ccm-interface
Added the default value of forename for name parts.
Modified so the surename and forename are properly created on a new person dialog.
after lab, 5/5.
User en Adres klasse toegevoegt
Merge branch 'master' into diony/databaseklassen
Merge branch 'master' into diony/databaseklassen
begonnen aan event class
event klasse bijna af
event
event class is af
event klasse verbeterd
Main error
Merge branch 'vincent'

Conflicts:
	bin/GUI/Main.class
Added .gitignore
Merge branch 'diony/databaseklassen'
database classe
Versie 0.0.05
Merge branch 'vincent'

Conflicts:
	bin/GUI/Main.class
Versie 0.0.06
Versie 0.0.06
Versie 0.0.07
begonnen aan database systeem
database classe
apparently, PIL cant resize photos for shit, will do it in lightroom for the time being...
merge branch master into prod
Deleted old bootstrap
Added mongoid config for common posts
default zsh theme
better long description
try a complete the sortby rule index.

Signed-off-by: Daogang Tang <daogangtang@gmail.com>
Fixes up resource reloading, futzes with the way the rendercontext is recreated, and gets window resizing and resource reloading fixed up.
Added microposts and associations
Added user microposts
Content views: removing old test
forgot to change css to match new icon filename
ta tak
made knocking script darwin friendly
Add VIM review notes.
second simple test
TU-65 - Search solution Way2Think
move source, add test to SolvedIssue
TU-65 - Search solution Way2Think
Solutions - search first node
Merge remote branch 'origin/master'
TU-65 - Search solution Way2Think
Solutions - search first node - test wrote and passed
minor alt text fix
[leftmenu] lib/core lib/driver
[todo] view
Disabloidaan tää: Poistetaan aktiiviset, vanhentuneet lähdöt joihin ei oo liitetty yhtään tilausta. Kestää liian kauan. Pitää fiksata.
Voidaan tutkia miten laskut on laskuttunu ja rivit on kerätty!
Mennäänpäs saman kaavan mukaan ku muissaki
Käytetään slavea ja bugikorjaus!
Gebug parami veks!
Uus muuttuja jolla voidaan määritellä dirikka jonne tee_keraysera-funkkarin debugmessut tallennetaan.
Tallennetaa debugfile keräyserän numerolla jos debuggi on päällä.
Keräyserien debug viestien tallennus failiin!
automated commit from dev@dmehta Mon Sep 24 22:00:02 EDT 2012
automated commit from dev@dmehta Wed Oct 24 14:00:02 EDT 2012
Počeštění + Upravení pro Technicraft
Added GROUP BY statment to CDBQuery::getQuery() class function
Removed accidental checkin of filter hiding code.  If left in, this would cause some trouble if your table is hidden on page load.
ADB Root and Busybox
Write some variables into a file to make using the profiler easier
Настройка составного меню.
travis error?
Merge pull request #1 from digi604/new_toolbar

plugin in plugins merge
added some modifications to placeholder
adding frontend admin class to sideframe iframe
template cleanup, move mode changes to toolbar.js
create workable version again
added alternate plugin listing
added minor functions
Merge branch 'develop' of https://github.com/divio/django-cms into feature/new_toolbar

Conflicts:
	cms/static/cms/js/plugins/cms.placeholders.js
	cms/templates/cms/toolbar/placeholder_wrapper.html
Merge remote-tracking branch 'finalangle/feature/new_toolbar' into new_toolbar

Conflicts:
	cms/static/cms/js/plugins/cms.placeholders.js
	cms/templates/cms/toolbar/placeholder.html
	cms/templates/cms/toolbar/placeholder_wrapper.html
Merge pull request #1 from Averell/patch-1

Using content_tag() rather than tag() for friendly html5 parser compatibility
Caching enabled
updated locale stuff for case activity changes
update submodule refs to corehq
fix fuzzy where translations are not fuzzy
Merge pull request #65 from dimagi/case-activity-changes

Case activity changes
Removed hook_ding_library_menu_links() as we do not want to force menu points
Finished adding a few elements to the project
Changed submenu attribute name

Changed the 'submenu' html attribute name to 'data-submenu', 
making it valid html5. Need to change all instances in 
themes (3 entries in each index.php theme file).
Merge pull request #4 from bitjungle/patch-2

Changed submenu attribute name
Site updated at 2012-12-03 15:32:29 UTC
Site updated at 2012-11-06 22:10:42 UTC
Added defcon schedule picker.
[DDC-1783] Fix memory leak in ObjectHydrator when using AbstractQuery#iterate() and EntityManager#clear()
Merge branch 'DDC-1783'
Make sub classes inherit the parents referenceable property
Mapping exception when child doc. tries to change referenceable to false
Merge branch 'master' into phpcr-77

Conflicts:
	lib/Doctrine/ODM/PHPCR/Mapping/ClassMetadataFactory.php
Removed junk from PR
(re)Added mapping exception for overriding referenceable
Referenceable child tests

- Added annotation based tests for referenceable child Documents
Merge pull request #185 from dantleech/inherit-referenceable

Make sub classes inherit the parents referenceable property
fixed wrong status indication of sd log command if startup fails
Ignore measurement parts not projected to the plane
Fixed stupid typo in GPS app
Merge commit '3ccc6849ac11851589c04adbf834091a4d918a01'
Added a totally sweet mustache
poprawa
poprawa
poprawa
Further improvements made to readme file
froilo modificacndo el codigo maestro
(Bug 4654) Additional ?user=parameter for supporthelps

Debugging aid.
(Bug 4638) Trigger a tooltipout event on mouseout

Browser inconsistency: mouseout in Firefox always has returns true
for e.isDefaultPrevented() which was preventing the popup from
disappearing (rather annoyingly)

So instead of using the raw mouseout event, let's have this trigger our
custom tooltipout event, so we have more of the state under our control.
(Bug 4666) Fix expected URL for textcaptcha

We want /exampleuseranme/__rpc_captcha, not just /__rpc_captcha
Merge branch 'contextual-hover-stickiness-bug4638' into release-1.11.0

* contextual-hover-stickiness-bug4638:
  (Bug 4638) Trigger a tooltipout event on mouseout
Merge branch 'support-getuserpics-bug4654' into release-1.11.0

* support-getuserpics-bug4654:
  (Bug 4654) Additional ?user=parameter for supporthelps
Stop the app from starting twice
fix cakes change event bind error
change flipboard cake style
add admin transfer feauture
little code clean up,prepare to add site home/faq/about pages
Merge branch 'master' into product
add site about,faq,home page
add for neglish
little change for topicpage views
fix topicpage content dispaly
Merge branch 'master' into product
Add project readme and readme for state machine module
removed social widget links
IMPORT (kilobyte): ontoclasm's tiles for the rest of runes.
IMPORT (kilobyte): Inline in_bounds().

 It's a tiny function called from many tight loops.  Inlining it gives ~1%
 speedup in non-flto builds.
Corrected the menus were not highlited on EN pages. Removed the horarios inactive page.
Corrected the product url links. Added product images. Forced the page body width to 1024px.
added category listing of each post
Removed all of TMWs maps and added LOFs maps

-Removed TMW maps
-Added the starter map
-Renamed somber-cave map to match our naming convention
Add floodFill tests.
Repair user manager
About to split off Proto.go
Cleanup part 1
Cleanup for tower rewrite
Finished cleanup
Move proto work to proto.go
Wrap up so I can go home
Added a list of all Students who qualify for Commissioning
Tweaked appearance of InstructorApplication
Created Details page for InstructorApplication, Found Major Bug

None of the EducationalBackground data values are actually being saved
upon InstructorApplication submissions.
Added CommissioningController
Fix imac
Added OTA distribution
changed array to hashMap<Pair, long> to have bigger indexes: in array only int
Report test failures.
Another emailer fix.
Added 2-dimensional cross product
== 1.0.2 ==
Added: Admin command "/mychunk obprice {price}" for setting overbuy price
Added: Permission for setting overbuy price
Add php license
Refactor HttpConn.readq, writeq
remove project specific api method from test
all working, just need some refactoring, and may be some bugs not caught.
Rename SymLink class to OldSymLink
Create new SymLink class
Move to GitViewFS the responsibility to transform symlink target path to relative

Also rename readlink on SymLink to get_target_path
Implement HEAD symlink as an instance of the new GitViewFSObject class
Fixed typo.
Merge branch 'next' of github.com:erlware/sinan into next
Merge remote branch 'ericbmerritt/next' into rv

Signed-off-by: Jordan Wilberding <diginux@gmail.com>
adding new classes to manage mongo connection
Fix path to rest_get_references.py.
Update bash profile to add cabal/haskell/snap binary dir to PATH.
Catered for the case where the data is not terminated with a line-break
Merge branch 'master' of github.com:euangoddard/csv.js
Added custom launch file
index.php, first session-stuff
remove gwt-servlet.jar
Added: Test case for legacy metadata search by date.
Added: incomplete legacy search tests.

The missing legacy search features required some minor changes to the
sqlite database schema, to make some text columns case insensitive.
Faked prioritized languages list setting
changed email to jeffreyhodesphonarapp
prevent 'undefined' identity on first authentication try
[settings] manual operator selection (WIP)
Add numpy include directory

Needed if numpy is installed in a custom path.
Syntax gerður fallegur
Initial commit for EconomyTest.java
Merge branch 'development' of github.com:farhanrahman/kyoto into development
Fixes #90, removed session event from CarbonTarget

Now session target updating is called from the year event.
Merge branch 'issue90fix' into development
refactor: renamed targetType to TargetPeriodType
added javadocs/code tidying
Merge branch 'development' of ssh://github.com/farhanrahman/kyoto into development

Conflicts:
	kyoto/src/main/java/uk/ac/ic/kyoto/actions/AddRemoveFromMonitorHandler.java
	kyoto/src/main/java/uk/ac/ic/kyoto/actions/AddToMonitor.java
@cmd08 addToReports returns a Mutable Map, and associated changes in test countries and run files
Work on balancing investment
Merge branch 'development' of github.com:farhanrahman/kyoto into development
global staging whoops
Precompile more files.
Update MonTweetPy (0.2)

A better error handling and a new method to calculate real length of a
tweet
- Fixed function usage
minor improvment of scripts for an easier configuration
Minor fix
Add theme support
Very basic sketch of the magic_grid helper.
Rich snippets for products category
Fixing the import paths in the firefox prefix build files
advanced search css and javaascript
refactored publish method
added activate/deactivate feature
updated doc
fixed typo
temporary save
Add logout feature from ~fmarier/securenotes
Adding new cards
Don't capitalize names

Some people like to control the capitalization of their name.
Deleting cards
convert cbxyz scripts to one 'cryptobox' command
set umask when initializing database class
update bootstrap
add preliminary support for buidling embedde/depot versions simultaneously
convert option parsing to trollop
Use working git:// path to rraptorr/sun-java6.git.

Old path would error out with:
  warning: remote HEAD refers to nonexistent ref, unable to checkout.
New bashrc aliases: ed and ged. Each of them opens current dir in editor.
trying to get git hook to work
Set Tracker index directories on startup as all our volumes
Now uses custom vertex attributes.
Clarify that we are only talking about unfair economic advantages.
Clarify we are talking just about non-productive assets.
kdelibs-4.9.1-1-x86_64

* version bump
well it renders now!!!!
added script for building the rcp only
Minor enhancements to the readme.
4/17 - Styled most of the Projects page - Nick
updates to edit profile page and join page
sum of cs driver added
max width for embed imgs 100%
integrate embedly. doesnt work yet
integrate embedly. doesnt work yet
.net 3.5 compatibility
rewrote subplot pipeline so combne functions build out subplot data and pass it on with the layer in  subplots slot. ggplyr_build thne adds this data at the end of its build.
index instead
more cleaning adjustments
First pass at updated dependencies and code updates.
Improved handling of charset and rewriting behavior.
Extracted MIME handling code to new MIMEUtils class.
ServerContext implementations must now provide a dispatch implementation using WCI.
Temporary fix to make tests pass on Java 7.
Updated dependencies.
[maven-release-plugin] prepare release 2.2.0.Beta07
[maven-release-plugin] prepare for next development iteration
bug fix : wrong place
Add Git config
Add bashrc
tried ajax...failed
newInitialSystem --> System.newRandom

This makes it easier for me to play around with
System without pulling in infrastructure from
the tests.
keybard
Merge branch 'master' of github.com:gdotdesign/crystal
Improved String Matching

Improved the String Matching function and added a pdf with stats about
different stages of String matching testing.
version 1.0-RC9-SNAPSHOT
Work in progress

* All variables added.
dev-java/netcdf: Add the netCDF licence (which is *not* MIT)

I'm not sure why the license was changed when this ebuild was imported
from my overlay, but NetCDF deserves its own entry under licenses/

From http://www.unidata.ucar.edu/software/netcdf-java/documentation.htm:
> The library is freely available and the source code is released
> under the (MIT-style) netCDF C library license. Previous versions
> use the GNU Lesser General Public License (LGPL).

The license text [1] has several important deviations from MIT, for
example:

* netCDF does not explicitly grant the right to sublicense and/or sell
  copies, while MIT does.

There are also a number of other changes, involving legalese that I
don't understand.  However, I imagine the UCAR/Unidata lawyers made
the deviations from the MIT license intentionally, and Gentoo users
should be able to easily see what they are getting into by using this
package.

[1]: http://www.unidata.ucar.edu/software/netcdf/copyright.html
Merge pull request #27 from wking/master

dev-java/netcdf: Add the netCDF licence (which is *not* MIT)
Massive action/parsing rewrite, will not work yet.
updated ChangeLog
Merge branch 'master' into booksdb
fixed description displaying bug
Merge branch 'master' into booksdb
install all geoforms version updated
added a base url for the dashboard and made the templates to load first from statics app
next try without sudo
Untab'ed some files and fixed a paren. mismatch in the .emcas file
Fix conflicts
Fix style.
Merge pull request #46 from gerald/validate_event_dates

Add validation for event times. Disable count me in link if volunteers still needed is 0.
Merge pull request #51 from gerald/register_link

Update register and forgot password links in member area.
Defer user stats update like the others.

Change-Id: I6092f383d2e4a5f9a2457dbc4b0aa8a1f3c2829a
Moved begin() since the lock() function may cause a BEGIN.

Change-Id: Ib5f7d6b7464a27d08de12c63495374319ac09dfe
Merge "Defer user stats update like the others."
Merge "Moved begin() since the lock() function may cause a BEGIN."
Added check for submodule to auto-configure it
Merge branch 'master' of github.com:getlantern/lantern
Use own random() routine
Report the number of sparks
Update .js
add Rakefile
setlist show view small tweak.
Included mozart-emacs and mozart-app test for an easier bundle creation
always use thing
Video playback finally working
* issue #19 : base de données sqlite embarquée dans l'apk.
fixing sort orders and date formats for rss readers
timeline player audio
Fix #169 - ProGit code blocks aren't clipped
Merge branch 'master' of github.com:github/gitscm-next
add test case and update version tag
transcode: Add documentation to README
Removing infrastructure module.
determines Content-Type automatically. closes #28.
Fix docstring paramter type for debug
Fixes to Org Search classes
Merge pull request #18 from dblessing/master

Fixes to Org Search classes
Issue 34: Permissions

Issue 34: Services built

Issue 34: Permissions database created

Issue 34 - Partial implementation on getting permissions

Issue 34 - Remove debug statements

Issue 34 Created permission util and checker to clean things up

Issue 34 clean up permissions

Issue 34 TODO add default user full permissions so someone has permissions out of the gate

Issue 34 - Fix issue with converting portal user to yams account when they do not exist in LDAP

Issue 34 - Allow a permission check so the toolbar can display buttons

Issue 43 - Break down getBinaryPermissions()
Merge pull request #47 from dblessing/master

Issue34
Rebuild lang
Merge pull request #14 from dblessing/master

Rebuild lang
Heavy CSS & homepage rework

- H5BP CSS removed
- Grid CSS commented
- Reset CSS added
- Structure and homepage refactored
- Chosen JS added
misc map
Merge branch 'master' of https://github.com/gobelins/templates
user profile contact_details
Some information about array of functions and illegal types.
* fixed "make install" for non-JVM targets after r21069


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@21075 3ad0048d-3df7-0310-abae-a5850022a9f2
  * re-enabled enum -> dispinterface typecasts after r21069, bug noticed by
    Paul


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@21076 3ad0048d-3df7-0310-abae-a5850022a9f2
GRAILS-9213 - Optimize hibernate plugin reload
Merge pull request #227 from longwa/GRAILS-9213

GRAILS-9213 - Optimize hibernate plugin reload
Do not fail test if we have only the ROOT domain
Added missing job result types to map
Adding VAppClient and all associated domain objects
Issue 830: Initial setup for tests (both Live and Unit)
vcloud-director: added NetworkConnection.IpAddressAllocationMode for constants
Added more checks
VappTemplateClientLiveTest: work in progress
Domain objects implement List/Set where appropriate
Updated tests and domain objects if required
Changed VAppTemplateClientLiveTest to allow code to build
Domain object cleanup: add builders, hashCode and equals
Updates to domain objects, tests and checks as well as setings for JAXB access in classes and packages
Added builder for RASD and CIMResourceAllocationSettingDataType
Re-enable test listener and all VApp live tests
Incorporate code review comments from @jclouds
VAppTemplateLiveTest fixes
Moved CustomizationSection back to domain package
Merge pull request #441 from grkvlt/vapp

Issue 830: The VAppClient and VApp domain objects
Issue #830 VAppTemplate: live tests and various fixes
Merge pull request #442 from aledsage/VAppTemplate-LiveTests

Issue #830 VAppTemplate: live tests and various fixes
Moving old README, updating current asap.
Update README.md
Merge pull request #1 from v42/patch-1

Update README.md
Bug 810926 - [Contacts] Facebook - Logout with XHR System
Merge pull request #6359 from crdlc/fb-logout

Bug 810926 - [Contacts] Facebook - Logout with XHR System
[Dialer] Deletion of all the appearances and usages of CustomDialog.
version bump and change log.
Merge branch 'release/0.51' into develop
swig fixes for sbuffer and intrusive_ptr
adding ohmyzsh as submodule
Update src/main/java/com/mycompany/postcheck/Main.java
Record the server accessed recently and enter the server automaticly
Fixed spacing for Dell TV fix gallary
enabled multiselection; deactivated restoring backups for now.
algos 5
advances in dataflow programming languages
changed version numbering
\nocite{*}
minor changes
more on programming paradigms
Merge branch 'master' of github.com:hardselius/cpc-dsl
hello
merge prob
all remote merge
fix conflict
Real commit on te
Merge branches 'te' and 'master' into te

Conflicts:
	README
statusicon: Fix delay in menu closing when clicking Add...
Add directory for legal files
event log: Don't show folder name in entries when in single folder view
+ ‘about.html’
week_2 code samples
Update list of unicode characters
Update kit managment.

If no kitname is given, $_this does not exist. Else, it is set to the
kit instance. That's all.
[auto] Merge from Dispatcher

    • #74bf024 — Update kit managment. (Ivan Enderlin, 2012-10-12)

---

Merge remote branch 'library-dispatcher/master'
Welcome to Hoa\Console\Cursor \o/.

Following operations are available:
    • move;
    • moveTo;
    • save;
    • restore;
    • clear;
    • scroll;
    • hide;
    • show;
    • getPosition.
Update API documentation.
Use Hoa\Console\Cursor and update autocompletion.

When autocompletion proposes many solutions, we do not print a new
prompt.
[auto] Merge from Console

    • #a95f67e — Welcome to Hoa\Console\Cursor \o/. (Ivan Enderlin, 2012-11-30)
    • #8bd9da8 — Update API documentation. (Ivan Enderlin, 2012-11-30)
    • #d65a3ef — Use Hoa\Console\Cursor and update autocompletion. (Ivan Enderlin, 2012-11-30)

---

Merge remote branch 'library-console/master'
Cleaning some unused code
Release v2_5_6
added style for design upload
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	static/jscript/massuploader/upload.js
	theme/frontend/pautina/style/default/css/style.css
added style for upload foto page
usr/lib
reduje el tiempo ejecucion de las animaciones
Changes case of Rakefile
fixed bug:
1. isLoaded in Ember-data
2. add currency name validation
add availability and installation sections, fixed quick demo after packaging changes
fixes file modes
made some specs for DiagonalStrategy
Included change password feature. Included email field in database
Adicionando dados em CSV das capitais e seus habitantes
leitor csv lixo
Arrumando conflitos do merge.
PATCH needed a little tweak to handle hierarchical packaging.
Merge branch 'iSoc12' of github.com:iRail/The-DataTank into iSoc12
Playing around with CSS for the overall layout
More CSS fiddling, configurable card size
Fiddling about with viewports
Figuring out media queries.
Work around stupid fucking bug in WebKit
Rarr, trying to get it working in IE.

Doesn't seem to want to load more than 30 inline images.
Need to try grouping images together (but keeping the
encoded size of each below 32KB).
change first page to home
estimation finalize, fix up carbon
Clean up generated pod and get rid of post release push
Add Scalar::Util dep
Add metaevents tests
Change name and added profile pic to profile
Only include bin folder for npm publishing
added test for IPv4 Address
working on IPv4 Address
Custom controller resolver, rewrite functions to take request parameter
screwing
varnish: Bump to version 3.0.3
added token provider interface.
Update the gitignore file

Signed-off-by: Imran M Yousuf <imyousuf@smartitengineering.com>
Add documentation for configurations

Signed-off-by: Imran M Yousuf <imyousuf@smartitengineering.com>
Build script runs swf
Remove Redundant
Cleaned up logging, now handles keyboard interrupt properly.
Added link to build details
Implemented #019242: Avoid file_exists calls in sso mechanism
Fixed #019243: Sso login mechanism should break inmediately after found a valid ssouser
Reverted unwanted version change
Fixed #019315: Mysterious variable in site.ini file
Optimized: eZTemplateSectionIterator attributes handling
Merge pull request #323 from patrickallaert/optimize-eZTemplateSectionIterator-attributes-handling

Optimized: eZTemplateSectionIterator attributes handling
Fixed #19307: Fix and restore eZFS2 unit test
Fixed the initialization of unit tests related to file handlers and cluster systems
Fixed #19198: Style conflict between Calendar and eZ Flow layout block
localization: updated ell-GR translation.ts
localization: updated ell-GR translation.ts
localization: updated ell-GR translation.ts
Merge pull request #328 from ptheo/localization

Localization: ell-GR translation.ts - 4.7(Etna) / 2012.4 translation campaign
Merge pull request #324 from crevillo/issue-019315

Fixed #019315: Mysterious variable in site.ini file
Fixed #19297: clustering doesn't respect StoreFilePermissions
Fixed #019246: Preview not working correctly with Html5 Videos
Added setting to avoid potential access to blacklisted attributes containing sensitive data
Merge pull request #306 from crevillo/issue-019242

Issue #019242 & #019243
Fixed #19299: Uploading an image to an article in IE8 raises an error
Merge branch 'master' of git://github.com/ezsystems/ezpublish
Fix for previous commit to only set updater if record changed to ensure that updater is set for a new record
Merge branch 'master' of github.com:ipa320/cob_robots into merge320
Merge branch 'master' of github.com:ipa320/cob_robots into merge320
Merge branch 'master' of github.com:ipa320/cob_robots into merge320
Merge branch 'master' of github.com:ipa320/cob_robots
Merge branch 'master' of github.com:ipa320/cob_robots into merge320
Merge branch 'merge320'
Merge branch 'master' of github.com:ipa320/cob_robots into merge320
Merge branch 'merge320'
remove param farthest_frame from footprint_observer
Merge branch 'master' of github.com:ipa320/cob_robots into merge320
merge merge320
add tray links to footprint observer
Merge pull request #26 from ipa-mig/master

remove param farthest_frame from footprint observer
fix desire arm joint names
Avoid circular imports between utils and filter(s)
Updated dependency for Netty and JUnit
Initial commit
Finished demo_app
Fixing remove on publish when feed > max_length
Merge branch 'master' of github.com:iuridiniz/txthoonk
Fixed SOAP sending
update numlockmask
Repaired build

Trait now correctly registers, and hashmaps are saved.

Left to do:
* Replace default values with modified config values
* Use MountListener to remove and replace mounts on log-in/out
Even more better thread safety...
Better checks for possible hanging notes...
Milestone #2

Address books have been added for reused during the ordering process.
There is also a dedicated address book page as well as front-end
create/edit. The theme has been updated to reflect the recent changes
and is available from the README as are the updated routes required for
the latest changes.

As usual please test and report back as and when you find any issues,
thanks!
added mapping to index.html for js managed app parts
rename a variable ... :'(
mode multiplayer debug + websocket pour vrai!
`brew versions` cache wip
Se agregó la opción de listar participantes según su universidad. También se mejoró la navegación de la lista de participantes, separando la misma por páginas
Now buses aren't written if their content don't change.
Reset is not working properly with this changes.
Fixed reset.
Update to relative paths.
Merge branch 'master' of github.com:jakobadam/dwidgets

* 'master' of github.com:jakobadam/dwidgets:
  github link
Added first version of GPS sketch for using OpenLog as a GPS logger
keeping interface more consistent
tidied up the robot class
robots shoot lasers in their starting position (but only once)
now in the middle of making laser appear but it doesn't work yet
changes to code_writer
Rushed beginnings of an install script
solution to problem 2 in C
Refactoring with support functions, no longer waiting for DOMReady
Use current gitconfig
Merge branch 'master' of github.com:jaylevitt/dotfiles

* 'master' of github.com:jaylevitt/dotfiles:
  Set 000-mybin to /Users/jay; $HOME doesn't get interpreted
Improved makefile and added class-specific exception
bisective lookup in weight based sampler uses std::lower_bound
t/zz-example.t required ExtUtils::LibBuilder
Merge pull request #13 from alexrj/patch-1

t/zz-example.t required ExtUtils::LibBuilder
1334863346
Switch GH urls to raw host.

This way if you `curl` there's no redirect to deal with.
Update gitignore
Update requirements
Separate script from library
Modify exe.c to handle JMPT a bit better. WIP.
Modify analyse.c to handle the case when number of paths at loop_head is 1.
copy
Merge branch 'master' of github.com:jcortesg/investico
fix idea data panel
Removed disabling of action buttons in the HUD.

Previously, the buttons to create a unit in the HUD would be disabled if
there weren't enough resources. However, this seemed confused people, so
now the game allows the player to click the buttons when there aren't
enough resources, but a notification is displayed to tell the player why
it isn't doing the action.
SOCDBHelper.initialize: more granular error checks; javadocs
SOCDBHelper +runSetupScript; javadocs
DB setup script comments in sql, README.developer
SnippingTextArea: (thanks olivierdeckers) Generalize OSX version check for bugfix
SOCDBHelper.initialize: catch/throw ioexception
SOCBoardLarge +maxPlayers for scenario layouts
makeNewBoard consistency: makeNewBoard_checkLandHexResourceClumps throw if invalid hex land type -1, instead of endless loop
_SC_FOG: makeNewBoard actual layout (for 6 players)
_SC_PIRI: SOCPlayer +canPlayWarshipConvert; show in handpanel; javadocs
Introduced ModuleManager and copied code with as little changes as possible into ModuleManager.

Signed-off-by: jdo <juergen.donnerstag@gmail.com>
Updated theming documentation
parser: new nesting markup
Merge pull request #83 from jediwhale/parser_nesting

parser: new nesting markup
GWT shell
Spring/GWT wiring
Basic blog viewing widget
Blog editing widget
Fix validation warnings
Add gwt-platform for Model View Presenter functionality
Wire in GWTP dispatch
Basic authentication
Add custom login page

Using an jspx page for login (external to GWT).
Added site wide login

Moved security configuration to app-security.xml.
Moved gwtp related spring config to app-gwtp-context.xml to work
around gwtp bug #420 which causes test run failure:

    Spring Test Context Issue With Duplicate ActionHandlerValidatorMap
    http://code.google.com/p/gwt-platform/issues/detail?id=420

Set GWT test mode to htmlUnit (vs default manual mode).
Moved auth related classes to web.auth package (out of web.server.auth)
Move GWT related code to web.gwt package
Move user auth to database, add ability to change password
Use bcrypt for password database encryption
Audit logged in user, fix tests
Add missing copyrights
Some style fixes
Added missing documentation, remove unused classes
Wired in GWT Request Factory
Basic entry creation and editing
Updates Actor doc: s/calculatePosition/updateState/
Performs some formatting cleanup the KeyframeProperty docs.
Performa reorg of the Canvas docs, minor API doc corrections.
Finalizando comando handler add, remove e list
up key fixed to cycle through history
completion section setup
prompt setup
set cdpaths to be stored in a file
added functions and syntax highlighting
ignore cache folder
added Python version and platform info, added html doctype
fixed vundle submodule
bundles
small fixes in parser.py
Initial attempt at ANN for Digit Recogniser problem.
Initial attempt at ANN for Digit Recogniser problem.
初始化版本库
初始化版本库
Converted tables in viewevent into tableviewer. fixed twochoicedialog's button size.
changed fonts and updated descriptions
Merge branch 'SKBRANCH' of github.com:jing200588/T2G4_EM into SKBRANCH

Conflicts:
	participant/Participant.java
	participant/ViewParticipantList.java
Google Interview
Google
Minor changes on datatypes, HTTP client
ApplicationService implementation. Maven config on jirafe-admin for integration tests. Starts coding integration test for ApplicationService.
changes to syle and jade files
Merge branch 'master' of https://github.com/jiveturkeyJay/site
removed archive
Changed location of pg
Pas de lib en SNAPSHOT sur le master
Turn off a lot of logging so we can see what is going on.
Fix a post-condition which matches the wrong term.
sincronizame esta
[css] Call out the password input
Updated title line
Added task-spooler formula
Auto-update: 21-Sep-2012 12:02:13
Added install script and updated example and README.txt
Elements now addable and editable by themes' add/edit interface
Added some validation to themes/elements
Hopefully fixes ip regex
accomplish auth features
add book manually
testing .gitattributes
again .gitattributes
Update session caches before creating FDT files, so that everything can be found
Added first part of intersect
Switch 'bundle exec' alias from 'b' to 'be' and added 'bundle' alias 'b'. Added test alias.
Added heroku to path
Updated tmux scripts to not fire servers, since I am now using pow
Added tmux paste buffer code
Added vim function for executing the current test file
readme edits
Allow applications to specify custom commands
add note about compat
Add the package source to the package description
Add recipe for elscreen
Merge pull request #56 from shosti/master

Add recipe for elscreen
added package mediawiki
Merge pull request #58 from bbatsov/master

Added package mediawiki
Updated source tag to simply [source: <src>]
Adding the Twilight color theme for Emacs 24
Moved config argument to the end
Merge pull request #55 from leathekd/master

Add the package source to the package description

OK lets do this.
Merge pull request #60 from developernotes/master

Twilight color theme for Emacs 24
Merge pull request #59 from joostkremers/master

A recipe for pandoc-mode
Added recipe writegood-mode
added php-mode
Merge pull request #61 from ljos/master

Added writegood-mode
Merge pull request #62 from bbatsov/master

Added the php-mode package
Add recipe for highlight-parentheses
Merge pull request #66 from shosti/master

Add recipe for highlight-parentheses
Added recipe for jabber-mode.
Add recipe for redshank.
Merge pull request #68 from Abrahanfer/master

Added recipes for Jabber-mode
Merge branch 'colordev'
Merge branch 'master' of https://github.com/josankapo/FlyPaper
reproof
docs and version
renamed BobBee to BobFly & streamlined
rebuilding motions init
preparation for breaking apart into files and adding build
no choice !!!
Revert "no choice !!!"

This reverts commit f2005e4a221eb3353b809b1eeb2ba97017fd71e6.
Ajout systeme host/client
added archiving task to worker
Code correction

Using JS properly
+ Beautification
Version traspaso
Merge branch 'master' of git://github.com/joslash/colportaje
traspasoAsociados y traspasoColportores
Merge branch 'master' of git://github.com/joslash/colportaje
Merge pull request #20 from wilberlopez7/master

traspasoAsociados y traspasoColportores
OS-1450 panic in list_remove() from kvm_mmu_free_page()
add cat
Merge branch 'dev' of https://github.com/jplusui/jplus-milk into dev
提示
Clase de prueba
asdasd
asd
prueba
com 9

comp 9
Update Model/Behavior/MeioUploadBehavior.php

Removed line 909, since the absolute path is setting in line 918
Merge pull request #105 from wesleyklewerton/master

Fixed bug of not creating thumb image for 'normal'. The absolute path was being assigned twice.
More incremental work
Revert Association Provider. Instead, use AOSP PreferredActivity api.
This is my very first commit to GitHub.

This is a very special event.

and

I am very excited.
Redhat PolicyPack
Check for trailing comma in ObjectExpression.

Also, refactored Reason a bit.
Moved all messages into a separate file.
Added support for real line numbers
Reused same dir tree from Win 7 with eclipse 3.7.2 64-bit, made new Elexis Praxis configuration
trying work with .gitignore
carousel stuff
carousel stuff
added rspec
basic book model and bare test added
edited my clubs html/css
edited dashboard html/css
Created book and user library tables
added book model
fix merge conflict
Created core models
removed comments and cleaned up spacing
moved typekit js to head
merged ericacss
added .number class to reduce selectors
Merge branch 'lisa'
minor html/css formatting changes
Merge branch 'kathleen'
uhhh yeah we're NOT hiring
CSS and design changes
security updates
* Added Group Member retrieval
quickfix to percentages
Add cd aliases.
Rename update-build to up.
Add emacs to time tracker exceptions.
Sign in flow, browser language detection
Save and render information about preferrable user settings'
Made the transition between changing the bar button items smoother.
responsive design and favicon
Updated ValueInjection, added Includes.
Fix: CampaignMaster object treated as a Integer(campaing master id), due to change on previous select box
CRASH INSTRUCTIONS
fix script
Better handle failure to read from input stream.
Notirifations sample now Works on Chrome
Updated to working version of login.php

Removed the eclipse .metadata folders from repository. Added the How to
draw your Health Family Tree_version 10.pdf supplied by the client.
added to python plotting & fitting scripts
gallery
responsive
Fixed copy() array iteration bug
Chmodding goodness
adds some ls aliases
Merge pull request #2 from mtylty/219cf52a3f02aa2a992787674a19f45293538b19

useful ls aliases
Add main game component and the app also boot !!
Merge branch 'kdorman' of https://github.com/kennydorman/pineal into ajacques
DialogBox class
Do not try to request pending messages when network is down (tolerated_network_errors parameter added) - fixes #18
added front page feature
reorganizing
updated requirements
reorganizing
create staging dir
Added code to run pylint
Remove #! header from files that are not executable.
Patch by malcolmlewis.
Bug lp:988364
Update FSF address in pylast.py.
Patch by malcolmlewis.
Bug lp:987883
JSON API
Merge remote-tracking branch 'kreed/json'
Flexibility fixes + selected pseudoclass application
Speedhack to overcome always-stretch behaviour of the image decorator
Add Game controller
Adopted tests.py to match the previous commit (redirect after successful event add/edit).
make front page pretty
Merge branch 'master' into deploy
Updated favicon set
browser tests running in IE9

 On branch master

	modified:   test/runner_browser.html
added further projects (which where so far only at capgemini laptop)
Add autoStart option to AppleEvents.SendUsingPSN
added Access-Control-Allow-Origin Header
Test against the latest gem version
Tightened up the dis graph to see solid msd growth
Forgot to add pictures associated w/ msd
bundle preloaded files also when not compressing them
add deleteFile to FS
properly detect windows in eliminator
some TODO stuff in gl code
windows fixes
basic support for -M and -MM
comment
Add Behdad Esfahbod to the AUTHORS file
remove unneeded -MF workaround code
Merge branch 'incoming' of github.com:kripken/emscripten into incoming
legalize loads and stores of entire structures
properly legalize storing an entire structure literal
handle switch with new relooper
remove mentions of obsolete emld
search for waiter
waits fix
add waiter.reserve example, issue #8
fix waiter data setter
Fixes issue #41

Modifying bundle to allow authentication for servers that do not allow
anonymous searches and where user credentials are not provided.

 - Added parameter to Authentication provider to bind with
   user credentials before loading user and roles
 - Added alternative auth method to user interface that will
   bind user before loading user and roles
 - Added alternative bind method to user inferface that will
   bind with username from form rather than loaded DN
Merge branch 'master' of github.com:ktsharp/LdapBundle
Fix and improve single file field JS
custom.css modified
Finished layout and routes
Inital dump of elevator prototype
Merge branch 'master' of github.com:kunalbhat/elevator
improve unix support for chsh
add alias for checking system temperature
improve cli vim support
set $EDITOR to vim if mvim isn't available
update oh-my-zsh
修改了代码以增加图片
upadted the code coverage function to return project name key assoc. array of desired data
spinner was added to loading of episode, episode list and search results
Minor update to keep recently fixed WEB-DL searches working for Newzbin provider. Newzbin corrected their attribute from Web-DL to WEB-DL which stopped Sickbeard from finding results again.
Update to allow for Newzbin merging H.264 and x264 attributes into a single H.264/x264 attribute.
this fixes a issue where some images would not get returned this is due cherrypy throws a HTTPRedirect exception in some cases
small pep8 improvements
Merge pull request #388 from lad1337/fix_getImages_with_api_error

Fix get images with api error
Merge branch 'midget_development' into development_binary
Merge pull request #387 from azcom/development

Update to allow for Newzbin merging H.264 and x264 attributes into a …  …single H.264/x264 attribute.
Fix typo in versionchecker

There was a typo in versionChecker.py where it would not properly
singularize the word 'commit' if the user is only 1 commit behind.
Improved error handling reading autoProcess conf
read() was being used which will not generate an error and cause a hard to understand crash later on when trying to read something from the configuration file. This could happen if the file existed, but the permission(s) weren't okay.
Fix issue where sometimes multi-part episodes get named out of order.
Merge branch 'master' of https://github.com/SerhatG/Sick-Beard into development
Merge branch 'patch-1' of https://github.com/starcza/Sick-Beard into development
Merge branch 'fix_versionchecker_typo' of https://github.com/spikegrobstein/Sick-Beard into development
Merge branch 'midget_development' into development_binary

Conflicts:
	sickbeard/versionChecker.py
added ttl_v-maxage.vcl
render
render
fix
render
Corrige memory leak na escolha de exercicio
Correctly zero out real padding in struct literals.

Fixes the std.variant unit tests on x86_64.
Only emit a single bitcast for struct literal padding.

Mostly a cosmetic change.
Merged latest druntime changes.
Adding a note about test renders being rejected

git-svn-id: https://svn.blender.org/svnroot/bf-extensions/trunk/py/scripts/addons@3669 96b784f8-4ae3-dd11-aff7-0030488c597c
test editing README
add Kwb.java
add Kwb.java
merge from lee
fix Kwb.java
Merge remote branch 'lee/work' into lee

Conflicts:
	src/commons/konoha2/Kwb.java
Merge branch 'lee' into work
combined Kwb.java
fix Kwb.java
fix Kwb.java
Merge branch 'master' of https://github.com/kanemura1206/jkonoha into kanemura
Change Kwb.java
editing Kwb.java, Perror.java
interrupt when error
Initial commit of a tmux script
improved logging completeness when uncaught exception thrown
Add code to read configuration file
update
Merge branch 'master' of https://github.com/librae8226/vimwiki
add plugin ios-alink.js
Merge branch 'master' of https://github.com/lichangwei/gesture
EulerProject 8-10
exercise 4.5 poj:2159 AC
exersize 4.6 poj not found
Warning about ->isa & object_setClass()
Second commit! corrected  link
Semi-completed refactoring, introduced symbolic refs.
Hive udf SplitPart
Big working update